svn commit: r476942 - in /tomcat/connectors/trunk/jk/native: apache-1.3/mod_jk.c apache-2.0/mod_jk.c

[rjung]

Author: rjung
Date: Sun Nov 19 14:05:01 2006
New Revision: 476942

URL: http://svn.apache.org/viewvc?view=rev&rev=476942
Log:
Fix two compilation errors in the modules.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
    tomcat/connectors/trunk/jk/native/apache-2.0/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=476942&r1=476941&r2=476942
==============================================================================
--- 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 14:05:01 
2006
@@ -2149,7 +2149,6 @@
         overrides->session_indicator = base->session_indicator;
     if (!overrides->key_size_indicator)
         overrides->key_size_indicator = base->key_size_indicator;
-    }
 
     if (!overrides->secret_key)
         overrides->secret_key = base->secret_key;

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=476942&r1=476941&r2=476942
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Nov 19 14:05:01 
2006
@@ -2276,7 +2276,6 @@
         overrides->session_indicator = base->session_indicator;
     if (!overrides->key_size_indicator)
         overrides->key_size_indicator = base->key_size_indicator;
-    }
 
     if (!overrides->secret_key)
         overrides->secret_key = base->secret_key;
@@ -2376,7 +2375,7 @@
     conf = ap_get_module_config(s->module_config, &jk_module);
 
     if (conf->log_file == NULL) {
-        conf->log_file = ap_server_root_relative(pconf, JK_LOG_DEF_FILE);
+        conf->log_file = ap_server_root_relative(p, JK_LOG_DEF_FILE);
         if (conf->log_file)
             ap_log_error(APLOG_MARK, APLOG_INFO | APLOG_NOERRNO,
                          0, s,



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]