jfclere 01/09/04 03:57:04
Modified: jk/native/apache-2.0 mod_jk.c
Log:
The code was not prepared for windows.
And ap_server_root_relative does the ap_pstrdup for us.
Revision Changes Path
1.18 +5 -11 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_jk.c 2001/09/03 10:08:11 1.17
+++ mod_jk.c 2001/09/04 10:57:03 1.18
@@ -60,7 +60,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.17 $ *
+ * Version: $Revision: 1.18 $ *
***************************************************************************/
/*
@@ -645,11 +645,8 @@
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
- conf->worker_file = ap_pstrdup(cmd->pool,worker_file);
+ /* we need an absolut path (ap_server_root_relative does the ap_pstrdup) */
+ conf->worker_file = ap_server_root_relative(cmd->pool,worker_file);
if (conf->worker_file == NULL)
return "JkWorkersFile file_name invalid";
@@ -674,11 +671,8 @@
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
- conf->log_file = ap_pstrdup(cmd->pool,log_file);
+ /* we need an absolut path */
+ conf->log_file = ap_server_root_relative(cmd->pool,log_file);
if (conf->log_file == NULL)
return "JkLogFile file_name invalid";
