Author: rjung
Date: Thu May 17 08:40:49 2007
New Revision: 538975
URL: http://svn.apache.org/viewvc?view=rev&rev=538975
Log:
Port 1.2.23 changes from 1.2.23 branch to trunk
(r538911, r538964)
Modified:
tomcat/connectors/trunk/jk/native/common/jk_global.h
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml
Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=538975&r1=538974&r2=538975
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Thu May 17 08:40:49
2007
@@ -234,7 +234,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/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=538975&r1=538974&r2=538975
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu May 17
08:40:49 2007
@@ -23,7 +23,7 @@
new documentation project for JK was started.
</p>
</section>
-<section name="Changes between 1.2.22 and 1.2.23">
+<section name="Changes between 1.2.23 and 1.2.24">
<br />
<subsection name="Native">
<changelog>
@@ -32,6 +32,19 @@
</update>
<update>
Docs: Add comments on i5/OS build for V5R4 and previous releases.
(hgomez)
+ </update>
+ </changelog>
+ </subsection>
+</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>
Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?view=diff&rev=538975&r1=538974&r2=538975
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Thu May 17 08:40:49
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
+<source>
+ 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 resolved.
+This is less spec compliant and is <b>not safe</b> if you are using
+prefix JkMount. This option will allow to rewrite URIs with
+mod_rewrite before forwarding.
-<source>
- JkOptions +ForwardURICompatUnparsed
+<source>
+ JkOptions +ForwardURICompat
</source>
<br/>
@@ -460,10 +468,13 @@
</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 resolved.
+This will not work in combination with URL encoded session IDs,
+but it will allow to rewrite URIs with mod_rewrite before forwarding.
-<source>
+<source>
JkOptions +ForwardURIEscaped
</source>
@@ -472,7 +483,7 @@
</p>
<p>
-JkOptions <b>ForwardDirectories</b> is used in conjunction with
<b>DirectoryIndex</b>
+JkOptions <b>ForwardDirectories</b> is used in conjunction with
<b>DirectoryIndex</b>
directive of Apache web server. As such mod_dir should be available to Apache,
statically or dynamically (DSO)
<br/>
Modified: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=538975&r1=538974&r2=538975
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Thu May 17
08:40:49 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,40 @@
</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 resolved.
+This is less spec compliant and is <b>not safe</b> 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 resolved.
+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/trunk/jk/xdocs/webserver_howto/nes.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml?view=diff&rev=538975&r1=538974&r2=538975
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml Thu May 17
08:40:49 2007
@@ -204,7 +204,7 @@
<source>
Init fn="load-modules" funcs="jk_init,jk_service"
shlib="c:/jk/lib/nsapi_redirect.dll" shlib_flags="(global|now)"
- Init fn="jk_init" worker_file="c:/jk/conf/workers.properties"
log_level="debug" log_file="c:/jk/logs/nsapi.log"
+ Init fn="jk_init" worker_file="c:/jk/conf/workers.properties"
log_level="debug" log_file="c:/jk/logs/nsapi.log" shm_file="c:/jk/logs/jk_shm"
</source>
<ul>
<li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
