Return-Path: 
 <tomcat-dev-return-16034-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 24350 invoked from network); 9 Aug 2002 17:46:00 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 Aug 2002 17:46:00 -0000
Received: (qmail 3475 invoked by uid 97); 9 Aug 2002 17:46:20 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 3459 invoked by uid 97); 9 Aug 2002 17:46:20 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 3441 invoked by uid 97); 9 Aug 2002 17:46:19 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 9 Aug 2002 17:45:50 -0000
Message-ID: <20020809174550.96272.qmail@icarus.apache.org>
From: costin@apache.org
To: jakarta-tomcat-connectors-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2
 mod_jk2.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>