tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/server/apache2 mod_jk2.c
Date Wed, 22 May 2002 23:44:23 GMT
costin      02/05/22 16:44:23

  Modified:    jk/native2/server/apache2 mod_jk2.c
  Log:
  Remove printfs.
  
  I tested apache2 with
   <Location>
     JkSet group lb
   </Location>,
  seem to work fine ( with Apache doing the mapping ). No time for ab tests
  now.
  
  Revision  Changes    Path
  1.25      +8 -11     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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_jk2.c	17 May 2002 00:31:55 -0000	1.24
  +++ mod_jk2.c	22 May 2002 23:44:23 -0000	1.25
  @@ -59,7 +59,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *                 Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.24 $                                           *
  + * Version:     $Revision: 1.25 $                                           *
    ***************************************************************************/
   
   /*
  @@ -236,14 +236,11 @@
       jk_uriEnv_t *new = (jk_uriEnv_t *)apr_pcalloc(p,sizeof(jk_uriEnv_t));
       
       
  -    /* XXX */
  -    fprintf(stderr, "XXX Merged dir config %p %p %s %s\n",
  -            base, new, base->uri, add->uri);
  +    if( base->mbean->debug > 0 ) {
  +        fprintf(stderr, "mod_jk2:mergeDirConfig() Merged dir config %p %p %s %s\n",
  +                base, new, base->uri, add->uri);
  +    }
   
  -/*     if( add->webapp == NULL ) { */
  -/*         add->webapp=base->webapp; */
  -/*     } */
  -    
       return add;
   }
   
  @@ -627,9 +624,9 @@
        * but that's too complex for now.
        */
       if( uriEnv!= NULL && uriEnv->workerName != NULL) {
  -        env->l->jkLog(env, env->l, JK_LOG_INFO, 
  -                      "PerDir mapping  %s=%s\n",
  -                      r->uri, uriEnv->workerName);
  +        if( uriEnv->mbean->debug > 0 )
  +            env->l->jkLog(env, env->l, JK_LOG_INFO, 
  +                          "PerDir mapping  %s=%s\n",r->uri, uriEnv->workerName);
           
           ap_set_module_config( r->request_config, &jk2_module, uriEnv );        
           r->handler=JK_HANDLER;
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message