Fix a bug in the normalization checks that prevented file based requests, such as SSI file includes, from being processed.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/jk/trunk@1867891 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
index 8f80801..6017751 100644
--- a/native/apache-2.0/mod_jk.c
+++ b/native/apache-2.0/mod_jk.c
@@ -4035,6 +4035,15 @@
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) {
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index 6003b70..413f073 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -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>
