Author: rjung
Date: Fri Nov 2 17:38:35 2007
New Revision: 591524
URL: http://svn.apache.org/viewvc?rev=591524&view=rev
Log:
We created a new server config structure, but we didn't use it :(
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?rev=591524&r1=591523&r2=591524&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Fri Nov 2 17:38:35
2007
@@ -2496,8 +2496,8 @@
*/
if (sconf && sconf->s != srv && jk_mount_copy_all == JK_FALSE) {
jk_server_conf_t *srvconf = (jk_server_conf_t
*)create_jk_config(p, srv);
- srvconf = (jk_server_conf_t *)merge_jk_config(p, sconf, srvconf);
- ap_set_module_config(srv->module_config, &jk_module, srvconf);
+ sconf = (jk_server_conf_t *)merge_jk_config(p, sconf, srvconf);
+ ap_set_module_config(srv->module_config, &jk_module, sconf);
}
if (sconf && sconf->was_initialized == JK_FALSE) {
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?rev=591524&r1=591523&r2=591524&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Fri Nov 2 17:38:35
2007
@@ -2784,8 +2784,8 @@
*/
if (sconf && sconf->s != srv && jk_mount_copy_all == JK_FALSE)
{
jk_server_conf_t *srvconf = (jk_server_conf_t
*)create_jk_config(pconf, srv);
- srvconf = (jk_server_conf_t *)merge_jk_config(pconf,
sconf, srvconf);
- ap_set_module_config(srv->module_config, &jk_module,
srvconf);
+ sconf = (jk_server_conf_t *)merge_jk_config(pconf, sconf,
srvconf);
+ ap_set_module_config(srv->module_config, &jk_module,
sconf);
}
if (sconf && sconf->was_initialized == JK_FALSE) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
