tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-1.3 mod_jk.c
Date Tue, 04 Sep 2001 13:04:03 GMT
jfclere     01/09/04 06:04:03

  Modified:    jk/native/apache-1.3 mod_jk.c
  Log:
  Arrange the handle of relative pathes.
  
  Revision  Changes    Path
  1.13      +8 -10     jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_jk.c	2001/09/03 10:08:11	1.12
  +++ mod_jk.c	2001/09/04 13:04:03	1.13
  @@ -61,7 +61,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *              Dan Milstein <danmil@shore.net>                            *
    *              Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.12 $                                           *
  + * Version:     $Revision: 1.13 $                                           *
    ***************************************************************************/
   
   /*
  @@ -645,13 +645,12 @@
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
  -    if ( worker_file[0] != '/' ) {
  -        /* we need an absolut path */
  -        conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
  -    } else
  +    /* we need an absolut path */
  +    conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
  +    if (conf->worker_file == worker_file)
           conf->worker_file = ap_pstrdup(cmd->pool,worker_file);
    
  -    if (conf->log_file == NULL)
  +    if (conf->worker_file == NULL)
           return "JkWorkersFile file_name invalid";
   
       if (stat(conf->worker_file, &statbuf) == -1)
  @@ -674,10 +673,9 @@
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
  -    if ( log_file[0] != '/' ) {
  -        /* we need an absolut path */
  -        conf->log_file = ap_server_root_relative(cmd->pool,log_file);
  -    } else
  +    /* we need an absolut path */
  +    conf->log_file = ap_server_root_relative(cmd->pool,log_file);
  +    if ( conf->log_file == log_file)
           conf->log_file = ap_pstrdup(cmd->pool,log_file);
    
       if (conf->log_file == NULL)
  
  
  

Mime
View raw message