bojan       2002/07/23 21:48:52

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Save a strcmp() call.
  
  Revision  Changes    Path
  1.54      +3 -3      jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mod_jk.c  24 Jul 2002 02:38:32 -0000      1.53
  +++ mod_jk.c  24 Jul 2002 04:48:52 -0000      1.54
  @@ -1183,7 +1183,7 @@
       jk_server_conf_t *xconf;
       jk_logger_t      *xl;
       jk_server_conf_t *conf;
  -    int              rc;
  +    int              rc,dmt=1;
   
       /* We do DIR_MAGIC_TYPE here to make sure TC gets all requests, even
        * if they are directory requests, in case there are no static files
  @@ -1191,14 +1191,14 @@
        * used when JkOptions has ForwardDirectories set. */
   
       /* Not for me, try next handler */
  -    if(strcmp(r->handler,JK_HANDLER) && strcmp(r->handler,DIR_MAGIC_TYPE))
  +    if(strcmp(r->handler,JK_HANDLER) && (dmt=strcmp(r->handler,DIR_MAGIC_TYPE)))
           return DECLINED;
   
       xconf = (jk_server_conf_t *)ap_get_module_config(r->server->module_config, 
                                                        &jk_module);
   
       /* Was the option to forward directories to Tomcat set? */
  -    if(!strcmp(r->handler,DIR_MAGIC_TYPE) && !(xconf->options & JK_OPT_FWDDIRS))
  +    if(!dmt && !(xconf->options & JK_OPT_FWDDIRS))
           return DECLINED;
   
       worker_name = apr_table_get(r->notes, JK_WORKER_ID);
  
  
  

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

Reply via email to