Author: markt
Date: Wed Oct 2 15:00:48 2019
New Revision: 1867891
URL: http://svn.apache.org/viewvc?rev=1867891&view=rev
Log:
Fix a bug in the normalization checks that prevented file based requests, such
as SSI file includes, from being processed.
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=1867891&r1=1867890&r2=1867891&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Wed Oct 2 15:00:48 2019
@@ -4035,6 +4035,15 @@ static int jk_map_to_storage(request_rec
return DECLINED;
}
+ // Not a URI based request - e.g. file based SSI include
+ if (strlen(r->uri) == 0) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "File based (sub-)request for file=%s. No URI to
match.",
+ r->filename);
+ JK_TRACE_EXIT(conf->log);
+ return DECLINED;
+ }
+
clean_uri = apr_pstrdup(r->pool, r->uri);
rc = jk_servlet_normalize(clean_uri, conf->log);
if (rc != 0) {
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1867891&r1=1867890&r2=1867891&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Oct 2 15:00:48 2019
@@ -47,6 +47,10 @@
Extend trace level logging of method entry/exit to aid debugging of
request mapping issues. (markt)
</add>
+ <fix>
+ Fix a bug in the normalization checks that prevented file based
+ requests, such as SSI file includes, from being processed. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
