costin 2002/08/09 10:45:50 Modified: jk/native2/server/apache2 mod_jk2.c Log: Few cosmetic fixes. Remove old code ( uriEnv can't be null ). The uriEnv==null case was used to support SetHandler directive - which only sets jakarta-servlet handler but doesn't set any module-specific field We may add this later - for now using JkUriSet in a <Location> works fine. Revision Changes Path 1.47 +8 -19 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c Index: mod_jk2.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mod_jk2.c 24 Jul 2002 00:44:20 -0000 1.46 +++ mod_jk2.c 9 Aug 2002 17:45:49 -0000 1.47 @@ -524,7 +524,6 @@ jk_endpoint_t *end = NULL; jk_uriEnv_t *uriEnv; jk_env_t *env; - jk_workerEnv_t *workerEnv; jk_ws_service_t *s=NULL; jk_pool_t *rPool=NULL; @@ -541,8 +540,6 @@ return HTTP_INTERNAL_SERVER_ERROR; } - workerEnv = uriEnv->workerEnv; - /* Get an env instance */ env = workerEnv->globalEnv->getEnv( workerEnv->globalEnv ); @@ -554,22 +551,14 @@ return rc; } - if( uriEnv == NULL ) { - /* SetHandler case - per_dir config should have the worker*/ - worker = workerEnv->defaultWorker; - env->l->jkLog(env, env->l, JK_LOG_INFO, - "mod_jk.handler() Default worker for %s %s\n", - r->uri, worker->mbean->name); - } else { - worker=uriEnv->worker; + worker=uriEnv->worker; - if( worker==NULL && uriEnv->workerName != NULL ) { - worker=env->getByName( env, uriEnv->workerName); - env->l->jkLog(env, env->l, JK_LOG_INFO, - "mod_jk.handler() finding worker for %#lx %#lx %s\n", - worker, uriEnv, uriEnv->workerName); - uriEnv->worker=worker; - } + if( worker==NULL && uriEnv->workerName != NULL ) { + worker=env->getByName( env, uriEnv->workerName); + env->l->jkLog(env, env->l, JK_LOG_INFO, + "mod_jk.handler() finding worker for %#lx %#lx %s\n", + worker, uriEnv, uriEnv->workerName); + uriEnv->worker=worker; } if(worker==NULL || worker->mbean == NULL || worker->mbean->localName==NULL ) {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>