You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/11/24 02:49:55 UTC
svn commit: r478744 - in /tomcat/connectors/trunk/jk:
native/apache-2.0/mod_jk.c xdocs/changelog.xml
Author: markt
Date: Thu Nov 23 17:49:54 2006
New Revision: 478744
URL: http://svn.apache.org/viewvc?view=rev&rev=478744
Log:
Fix bug 36121. Don't change main uri when jk serves included uri.
Modified:
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/xdocs/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=478744&r1=478743&r2=478744
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Thu Nov 23 17:49:54 2006
@@ -2695,16 +2695,15 @@
}
worker = map_uri_to_worker(conf->uw_map, r->uri, conf->log);
-
+
if (worker) {
r->handler = apr_pstrdup(r->pool, JK_HANDLER);
apr_table_setn(r->notes, JK_NOTE_WORKER_NAME, worker);
/* This could be a sub-request, possibly from mod_dir */
- /* Also set the HANDLER and uri for subrequest */
+ /* Also add the the HANDLER to the main request */
if (r->main) {
r->main->handler = apr_pstrdup(r->main->pool, JK_HANDLER);
- r->main->uri = apr_pstrdup(r->main->pool, r->uri);
apr_table_setn(r->main->notes, JK_NOTE_WORKER_NAME, worker);
}
Modified: tomcat/connectors/trunk/jk/xdocs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/changelog.xml?view=diff&rev=478744&r1=478743&r2=478744
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/changelog.xml Thu Nov 23 17:49:54 2006
@@ -26,6 +26,10 @@
<br />
<subsection name="Native">
<changelog>
+ <fix>
+ <bug>36121</bug>: Don't change main uri when mod_jk serves
+ included uri. (markt)
+ </fix>
<update>
Apache VHosts: Merge JkOptions +base - -base + +vhost - -vhost. (rjung)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org