Author: rjung
Date: Thu Nov 23 04:17:22 2006
New Revision: 478544
URL: http://svn.apache.org/viewvc?view=rev&rev=478544
Log:
Apache vhost JkOptions +/- merging: +base - -base + +vhost - -vhost
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/changelog.xml
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=478544&r1=478543&r2=478544
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Thu Nov 23 04:17:22
2006
@@ -161,6 +161,7 @@
* Jk Options
*/
int options;
+ int exclude_options;
/*
* Environment variables support
@@ -1625,7 +1626,7 @@
conf->options &= ~mask;
if (action == '-') {
- conf->options &= ~opt;
+ conf->exclude_options |= opt;
}
else if (action == '+') {
conf->options |= opt;
@@ -2052,6 +2053,7 @@
c->format_string = NULL;
c->format = NULL;
c->mountcopy = JK_FALSE;
+ c->exclude_options = 0;
if (s->is_virtual) {
c->log_level = JK_UNSET;
@@ -2153,7 +2155,7 @@
if (!overrides->secret_key)
overrides->secret_key = base->secret_key;
- overrides->options |= base->options;
+ overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars_in_use) {
overrides->envvars_in_use = JK_TRUE;
@@ -2335,6 +2337,7 @@
ap_log_error(APLOG_MARK, APLOG_ERR, srv,
"JkRequestLogFormat format array NULL");
}
+ sconf->options &= ~sconf->exclude_options;
}
}
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=478544&r1=478543&r2=478544
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Thu Nov 23 04:17:22
2006
@@ -195,6 +195,7 @@
* Jk Options
*/
int options;
+ int exclude_options;
/*
* Environment variables support
@@ -1653,7 +1654,7 @@
conf->options &= ~mask;
if (action == '-') {
- conf->options &= ~opt;
+ conf->exclude_options |= opt;
}
else if (action == '+') {
conf->options |= opt;
@@ -2172,6 +2173,7 @@
c->format_string = NULL;
c->format = NULL;
c->mountcopy = JK_FALSE;
+ c->exclude_options = 0;
c->was_initialized = JK_FALSE;
if (s->is_virtual) {
@@ -2280,7 +2282,7 @@
if (!overrides->secret_key)
overrides->secret_key = base->secret_key;
- overrides->options |= base->options;
+ overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars_in_use) {
overrides->envvars_in_use = JK_TRUE;
@@ -2614,6 +2616,7 @@
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"JkRequestLogFormat format array
NULL");
}
+ sconf->options &= ~sconf->exclude_options;
}
}
init_jk(pconf, conf, s);
Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=478544&r1=478543&r2=478544
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Thu Nov 23 04:17:22 2006
@@ -27,6 +27,9 @@
<subsection name="Native">
<changelog>
<update>
+ Apache VHosts: Merge JkOptions +base - -base + +vhost - -vhost. (rjung)
+ </update>
+ <update>
Apache Docs: Adding requirements, context information, default values and
inheritance rules to the Apache config documentation. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
