cvs commit: jakarta-tomcat/src/native/mod_jk/apache2.0 mod_jk.c

[hgomez]

hgomez      01/04/04 22:27:53

  Modified:    src/native/mod_jk/apache1.3 mod_jk.c
               src/native/mod_jk/apache2.0 mod_jk.c
  Log:
  Clean handle of bad path to workers.properties file.
  Fix cleanup problem on Netware
  Submitted by: Mike Anderson
  
  Revision  Changes    Path
  1.8       +5 -0      jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_jk.c  2001/03/27 22:01:18     1.7
  +++ mod_jk.c  2001/04/05 05:27:52     1.8
  @@ -580,10 +580,15 @@
                                         char *worker_file)
   {
       server_rec *s = cmd->server;
  +    struct stat statbuf;
  +
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
       conf->worker_file = worker_file;
  +
  +    if (stat(worker_file, &statbuf) == -1)
  +        return "Can't find the workers file specified";
   
       return NULL;
   }
  
  
  
  1.12      +5 -0      jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/apache2.0/mod_jk.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_jk.c  2001/04/02 08:26:25     1.11
  +++ mod_jk.c  2001/04/05 05:27:53     1.12
  @@ -450,10 +450,15 @@
                                         char *worker_file)
   {
       server_rec *s = cmd->server;
  +    struct stat statbuf;
  +
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
       conf->worker_file = worker_file;
  +
  +    if (stat(worker_file, &statbuf) == -1)
  +        return "Can't find the workers file specified";
   
       return NULL;
   }