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-2.0 mod_jk.c
Date Mon, 03 Sep 2001 10:08:11 GMT
jfclere     01/09/03 03:08:11

  Modified:    jk/native/apache-1.3 mod_jk.c
               jk/native/apache-2.0 mod_jk.c
  Log:
  Allow relative path for the workers file.
  
  Revision  Changes    Path
  1.12      +10 -3     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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_jk.c	2001/08/06 15:43:30	1.11
  +++ mod_jk.c	2001/09/03 10:08:11	1.12
  @@ -61,7 +61,7 @@
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *              Dan Milstein <danmil@shore.net>                            *
    *              Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.11 $                                           *
  + * Version:     $Revision: 1.12 $                                           *
    ***************************************************************************/
   
   /*
  @@ -645,9 +645,16 @@
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
  -    conf->worker_file = worker_file;
  +    if ( worker_file[0] != '/' ) {
  +        /* we need an absolut path */
  +        conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
  +    } else
  +        conf->worker_file = ap_pstrdup(cmd->pool,worker_file);
  + 
  +    if (conf->log_file == NULL)
  +        return "JkWorkersFile file_name invalid";
   
  -    if (stat(worker_file, &statbuf) == -1)
  +    if (stat(conf->worker_file, &statbuf) == -1)
           return "Can't find the workers file specified";
   
       return NULL;
  
  
  
  1.17      +10 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_jk.c	2001/08/06 15:54:20	1.16
  +++ mod_jk.c	2001/09/03 10:08:11	1.17
  @@ -60,7 +60,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    * 		        Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.16 $                                           *
  + * Version:     $Revision: 1.17 $                                           *
    ***************************************************************************/
   
   /*
  @@ -645,9 +645,16 @@
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
  -    conf->worker_file = worker_file;
  +    if ( worker_file[0] != '/' ) {
  +        /* we need an absolut path */
  +        conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
  +    } else
  +        conf->worker_file = ap_pstrdup(cmd->pool,worker_file);
  + 
  +    if (conf->worker_file == NULL)
  +        return "JkWorkersFile file_name invalid";
   
  -    if (stat(worker_file, &statbuf) == -1)
  +    if (stat(conf->worker_file, &statbuf) == -1)
           return "Can't find the workers file specified";
   
       return NULL;
  
  
  

Mime
View raw message