Author: markt
Date: Mon Sep 10 10:12:06 2018
New Revision: 1840450
URL: http://svn.apache.org/viewvc?rev=1840450&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62689
Correct regression in 1.2.44 that broke request handling for "OPTIONS *"
requests. (rjung)
Modified:
tomcat/jk/trunk/native/common/jk_util.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=1840450&r1=1840449&r2=1840450&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Mon Sep 10 10:12:06 2018
@@ -2187,7 +2187,11 @@ int jk_servlet_normalize(char *path, jk_
// This test allows the loops below to start at index 1 rather than 0.
if (path[0] != '/') {
- jk_log(logger, JK_LOG_EMERG, "[%s] does not start with '/'.", path);
+ if (path[0] == '*' && path[1] == '\0') {
+ /* Most likely an "OPTIONS *" request */
+ return 0;
+ }
+ jk_log(logger, JK_LOG_WARNING, "Uri [%s] does not start with '/'.",
path);
return JK_NORMALIZE_BAD_PATH;
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1840450&r1=1840449&r2=1840450&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Sep 10 10:12:06 2018
@@ -41,6 +41,15 @@
</p>
</section>
<section name="Changes between 1.2.44 and 1.2.45">
+ <br />
+ <subsection name="Native">
+ <changelog>
+ <fix>
+ <bug>62689</bug>: Correct regression in 1.2.44 that broke request
+ handling for <code>OPTIONS *</code> requests. (rjung)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Changes between 1.2.43 and 1.2.44">
<br />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
