Author: rjung
Date: Wed Apr 2 11:04:10 2008
New Revision: 643998
URL: http://svn.apache.org/viewvc?rev=643998&view=rev
Log:
Fix Bugzilla issue 44738: Merging of JkOption ForwardURI*
between virtual hosts. Patch contributed by Toshihiro Sasajima.
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/miscellaneous/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?rev=643998&r1=643997&r2=643998&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 Wed Apr 2 11:04:10
2008
@@ -2400,7 +2400,12 @@
if (!overrides->key_size_indicator)
overrides->key_size_indicator = base->key_size_indicator;
- overrides->options |= (base->options & ~base->exclude_options);
+/* Don't simply accumulate bits in the JK_OPT_FWDURIMASK region, */
+/* because those are multi-bit values. */
+ if (overrides->options & JK_OPT_FWDURIMASK)
+ overrides->options |= (base->options & ~base->exclude_options) &
~JK_OPT_FWDURIMASK;
+ else
+ overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars) {
if (overrides->envvars && overrides->envvars_has_own) {
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=643998&r1=643997&r2=643998&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 Wed Apr 2 11:04:10
2008
@@ -2538,7 +2538,12 @@
if (!overrides->key_size_indicator)
overrides->key_size_indicator = base->key_size_indicator;
- overrides->options |= (base->options & ~base->exclude_options);
+/* Don't simply accumulate bits in the JK_OPT_FWDURIMASK region, */
+/* because those are multi-bit values. */
+ if (overrides->options & JK_OPT_FWDURIMASK)
+ overrides->options |= (base->options & ~base->exclude_options) &
~JK_OPT_FWDURIMASK;
+ else
+ overrides->options |= (base->options & ~base->exclude_options);
if (base->envvars) {
if (overrides->envvars && overrides->envvars_has_own) {
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=643998&r1=643997&r2=643998&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Wed Apr 2
11:04:10 2008
@@ -43,6 +43,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>44738</bug>: Fix merging of JkOption ForwardURI* between virtual
hosts.
+ Patch contributed by Toshihiro Sasajima. (rjung)
+ </fix>
<update>
URI Map: Add extension attributes to uri worker map.
Allowed are reply_timeout, active/disabled/stopped
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
