cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c

[mturk]

mturk       2002/10/02 03:27:18

  Modified:    jk/native2/common jk_uriEnv.c
  Log:
  Add the context to the getAttribute, so we can display what is
  the context of particular uri in the jkstatus
  
  Revision  Changes    Path
  1.35      +7 -5      jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c
  
  Index: jk_uriEnv.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- jk_uriEnv.c       2 Oct 2002 09:45:02 -0000       1.34
  +++ jk_uriEnv.c       2 Oct 2002 10:27:17 -0000       1.35
  @@ -104,10 +104,10 @@
           uriEnv->virtual = uriEnv->pool->pstrdup(env, uriEnv->pool, host);
           return JK_OK;
       }
  -    if (colon) {
  -        *uri = '\0';
  +    *uri = '\0';
  +    if (colon)
           uriEnv->port = atoi(colon);
  -    }
  +   
       /* If it doesn't start with /, it must have a vhost */
       if (strlen(host) && uri != host) {
           uriEnv->virtual = uriEnv->pool->calloc( env, uriEnv->pool, strlen(host) + 1 
);
  @@ -133,7 +133,9 @@
           return uriEnv->uri;
       } else if( strcmp( name, "group" )==0 ) {
           return uriEnv->workerName;
  -    }
  +    } else if( strcmp( name, "context" )==0 ) {
  +        return uriEnv->contextPath;
  +    }
       return NULL;
   }
   
  @@ -387,7 +389,7 @@
       return JK_OK;
   }
   
  -static char *myAttInfo[]={ "host", "uri", "group", NULL };
  +static char *myAttInfo[]={ "host", "uri", "group", "context", NULL };
       
   int JK_METHOD jk2_uriEnv_factory(jk_env_t *env, jk_pool_t *pool,
                                    jk_bean_t *result,
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>