cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c

[jfclere]

jfclere     01/08/06 08:54:20

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Arrange jk_set_log_file to allow relative path.
  
  Revision  Changes    Path
  1.16      +9 -2      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_jk.c  2001/08/03 14:42:45     1.15
  +++ mod_jk.c  2001/08/06 15:54:20     1.16
  @@ -60,7 +60,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
    *                   Henri Gomez <[EMAIL PROTECTED]>                               *
  - * Version:     $Revision: 1.15 $                                           *
  + * Version:     $Revision: 1.16 $                                           *
    ***************************************************************************/
   
   /*
  @@ -667,7 +667,14 @@
       jk_server_conf_t *conf =
           (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
   
  -    conf->log_file = log_file;
  +    if ( log_file[0] != '/' ) {
  +        /* we need an absolut path */
  +        conf->log_file = ap_server_root_relative(cmd->pool,log_file);
  +    } else
  +        conf->log_file = ap_pstrdup(cmd->pool,log_file);
  + 
  +    if (conf->log_file == NULL)
  +        return "JkLogFile file_name invalid";
   
       return NULL;
   }