svn commit: r476887 - /tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

[rj...@apache.org]

Author: rjung
Date: Sun Nov 19 11:09:58 2006
New Revision: 476887

URL: http://svn.apache.org/viewvc?view=rev&rev=476887
Log:
Some fixes to the Apache httpd 1.3 module:
- Change source to destination when copying a table
  (used for JkMountCopy, taken from Apache 2.x)
- Adding CHROOT trick to the log file
  (we already use it for the shm file and the mount
  file)

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=476887&r1=476886&r2=476887
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Nov 19 11:09:58 2006
@@ -941,7 +941,18 @@
                                                   &jk_module);
 
     /* we need an absolute path */
-    conf->log_file = log_file;
+    if (*log_file != '|') {
+        conf->log_file = ap_server_root_relative(cmd->pool, log_file);
+
+#ifdef CHROOTED_APACHE
+        ap_server_strip_chroot(conf->log_file, 0);
+#endif
+
+    }
+    else
+        conf->log_file = ap_pstrdup(cmd->pool, log_file);
+    if (conf->log_file == NULL)
+        return "JkLogFile file name invalid";
 
     return NULL;
 }
@@ -2100,7 +2111,7 @@
     int i;
     for (i = 0; i < sz; i++) {
         const char *name = jk_map_name_at(src, i);
-        if (jk_map_get(src, name, NULL) == NULL) {
+        if (jk_map_get(dst, name, NULL) == NULL) {
             if (!jk_map_put (dst, name,
                  ap_pstrdup(p, jk_map_get_string(src, name, NULL)),
                             NULL)) {
@@ -2259,6 +2270,11 @@
 #if !defined(WIN32) && !defined(NETWARE)
     if (!jk_shm_file) {
         jk_shm_file = ap_server_root_relative(p, JK_SHM_DEF_FILE);
+
+#ifdef CHROOTED_APACHE
+        ap_server_strip_chroot(jk_shm_file, 0);
+#endif
+
         if (jk_shm_file)
             ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO, s,
                          "No JkShmFile defined in httpd.conf. "
@@ -2630,4 +2646,3 @@
     NULL,                       /* new_connection */
     NULL                        /* close_connection */
 #endif /* EAPI */
-};



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org