Author: rjung
Date: Thu May 17 06:26:19 2007
New Revision: 538911
URL: http://svn.apache.org/viewvc?view=rev&rev=538911
Log:
Change the default value of JkOptions to ForwardURICompatUnparsed
and enhance documentation concerning the three possible
forwarding options.
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_global.h
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/reference/apache.xml
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/webserver_howto/apache.xml
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_global.h?view=diff&rev=538911&r1=538910&r2=538911
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_global.h
(original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_global.h Thu
May 17 06:26:19 2007
@@ -239,7 +239,7 @@
#define JK_OPT_FWDURICOMPATUNPARSED 0x0002
#define JK_OPT_FWDURIESCAPED 0x0003
-#define JK_OPT_FWDURIDEFAULT JK_OPT_FWDURICOMPAT
+#define JK_OPT_FWDURIDEFAULT JK_OPT_FWDURICOMPATUNPARSED
#define JK_OPT_FWDKEYSIZE 0x0004
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=538911&r1=538910&r2=538911
==============================================================================
---
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/miscellaneous/changelog.xml
(original)
+++
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/miscellaneous/changelog.xml
Thu May 17 06:26:19 2007
@@ -22,6 +22,19 @@
new documentation project for JK was started.
</p>
</section>
+<section name="Changes between 1.2.22 and 1.2.23">
+ <br />
+ <subsection name="Native">
+ <changelog>
+ <update>
+ Change the default value of JkOptions to ForwardURICompatUnparsed.
+ The old default value was ForwardURICompat.
+ This should make URL interpretation between Apache httpd and
+ Tomcat consistent (prevent double decoding problems). (rjung)
+ </update>
+ </changelog>
+ </subsection>
+</section>
<section name="Changes between 1.2.21 and 1.2.22">
<br />
<subsection name="Native">
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/reference/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/reference/apache.xml?view=diff&rev=538911&r1=538910&r2=538911
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/reference/apache.xml
(original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/reference/apache.xml
Thu May 17 06:26:19 2007
@@ -209,7 +209,8 @@
<br/>
This directive can be used multiple times per virtual server.
<br/>
-The default value is "ForwardURICompat".
+The default value is "ForwardURICompatUnparsed" since version 1.2.23.
+Until version 1.2.22 the default value was "ForwardURICompat".
</p></attribute>
<attribute name="JkEnvVar" required="false"><p>
Adds a name and an optional default value of environment variable
@@ -417,8 +418,9 @@
<p>
The three following options <b>+ForwardURIxxx</b> are mutually exclusive.
Exactly one of them is required, a negative sign prefix is not allowed with
them.
-By default, the option ForwardURICompat is turned on.
-You can turn this off by switching on one of the other two.
+The default value is "ForwardURICompatUnparsed" since version 1.2.23.
+Until version 1.2.22 the default value was "ForwardURICompat".
+You can turn the default off by switching on one of the other two options.
<br/>
<br/>
</p>
@@ -435,12 +437,14 @@
</p>
<p>
-JkOptions <b>ForwardURICompat</b>, you ask mod_jk to send the URI to Tomcat
normally,
-which is less spec compliant but mod_rewrite compatible,
-use it for compatibility with Tomcat 3.2.x engines (on by default).
+Using JkOptions <b>ForwardURICompatUnparsed</b>, the forwarded URI
+will be unparsed. It's spec compliant and also the safest option.
+It will always forward the original request URI, so rewriting
+URIs with mod_rewrite and then forwarding the rewritten URI
+will not work.
<source>
- JkOptions +ForwardURICompat
+ JkOptions +ForwardURICompatUnparsed
</source>
<br/>
@@ -448,11 +452,15 @@
</p>
<p>
-JkOptions <b>ForwardURICompatUnparsed</b>, the forwarded URI
-is unparsed, it's spec compliant but broke mod_rewrite.
+Using JkOptions <b>ForwardURICompat</b>, the forwarded URI will
+be decoded by Apache httpd. Encoded characters will be decoded and
+explicit path components like /.. will already be removed.
+This is less spec compliant and is not safe if you are using
+prefix JkMount. This option will allow to rewrite URIs with
+mod_rewrite before forwarding.
<source>
- JkOptions +ForwardURICompatUnparsed
+ JkOptions +ForwardURICompat
</source>
<br/>
@@ -460,8 +468,11 @@
</p>
<p>
-JkOptions <b>ForwardURIEscaped</b>, the forwarded URI is escaped and
-Tomcat (since 3.3 rc2) will do the decoding part.
+Using JkOptions <b>ForwardURIEscaped</b>, the forwarded URI will
+be the encoded form of the URI used by ForwardURICompat.
+Explicit path components like /.. will already be removed.
+This will not work in combination with URL encoded session IDs,
+but it will allow to rewrite URIs with mod_rewrite before forwarding.
<source>
JkOptions +ForwardURIEscaped
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=538911&r1=538910&r2=538911
==============================================================================
---
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/webserver_howto/apache.xml
(original)
+++
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/webserver_howto/apache.xml
Thu May 17 06:26:19 2007
@@ -456,8 +456,9 @@
<p>
The three following options <b>+ForwardURIxxx</b> are mutually exclusive.
Exactly one of them is required, a negative sign prefix is not allowed with
them.
-By default, the option ForwardURICompat is turned on.
-You can turn this off by switching on one of the other two.
+The default value is "ForwardURICompatUnparsed" since version 1.2.23.
+Until version 1.2.22 the default value was "ForwardURICompat".
+You can turn the default off by switching on one of the other two options.
<br/>
<br/>
</p>
@@ -474,31 +475,42 @@
</p>
<p>
-JkOptions <b>ForwardURICompat</b>, you told mod_jk to send the URI to Tomcat
normally,
-which is less spec compliant but mod_rewrite compatible,
-use it for compatibility with Tomcat 3.2.x engines (on by default).
+Using JkOptions <b>ForwardURICompatUnparsed</b>, the forwarded URI
+will be unparsed. It's spec compliant and also the safest option.
+It will always forward the original request URI, so rewriting
+URIs with mod_rewrite and then forwarding the rewritten URI
+will not work.
<source>
- JkOptions +ForwardURICompat
+ JkOptions +ForwardURICompatUnparsed
</source>
<br/>
<br/>
</p>
+
<p>
-JkOptions <b>ForwardURICompatUnparsed</b>, the forwarded URI
-is unparsed, it's spec compliant but broke mod_rewrite.
+Using JkOptions <b>ForwardURICompat</b>, the forwarded URI will
+be decoded by Apache httpd. Encoded characters will be decoded and
+explicit path components like /.. will already be removed.
+This is less spec compliant and is not safe if you are using
+prefix JkMount. This option will allow to rewrite URIs with
+mod_rewrite before forwarding.
<source>
- JkOptions +ForwardURICompatUnparsed
+ JkOptions +ForwardURICompat
</source>
<br/>
<br/>
</p>
+
<p>
-JkOptions <b>ForwardURIEscaped</b>, the forwarded URI is escaped and
-Tomcat (since 3.3 rc2) will do the decoding part.
+Using JkOptions <b>ForwardURIEscaped</b>, the forwarded URI will
+be the encoded form of the URI used by ForwardURICompat.
+Explicit path components like /.. will already be removed.
+This will not work in combination with URL encoded session IDs,
+but it will allow to rewrite URIs with mod_rewrite before forwarding.
<source>
JkOptions +ForwardURIEscaped
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
