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 2018/09/11 20:51:29 UTC
svn commit: r1840610 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: markt
Date: Tue Sep 11 20:51:29 2018
New Revision: 1840610
URL: http://svn.apache.org/viewvc?rev=1840610&view=rev
Log:
With the improvements in path parameter handling for the mapping phase, ensure the original URI - with the parameters - is used as the basis for the URI passed to Tomcat.
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1840610&r1=1840609&r2=1840610&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Sep 11 20:51:29 2018
@@ -1702,7 +1702,8 @@ static DWORD handle_notify_event(PHTTP_F
jk_pool_t pool;
char *uri_undec = NULL;
- char *uri = NULL;
+ char *cleanuri = NULL;
+ char *uri = NULL;
char *host = NULL;
char *translate = NULL;
char szHB[HDR_BUFFER_SIZE] = "/";
@@ -1771,7 +1772,8 @@ static DWORD handle_notify_event(PHTTP_F
rv = SF_STATUS_REQ_FINISHED;
goto cleanup;
}
- if (jk_servlet_normalize(uri, logger)) {
+ cleanuri = jk_pool_strdup(&pool, uri);
+ if (jk_servlet_normalize(cleanuri, logger)) {
write_error_response(pfc, 404);
rv = SF_STATUS_REQ_FINISHED;
goto cleanup;
@@ -1787,7 +1789,7 @@ static DWORD handle_notify_event(PHTTP_F
else
host = szHB;
}
- worker = map_uri_to_worker_ext(uw_map, uri, host,
+ worker = map_uri_to_worker_ext(uw_map, cleanuri, host,
&extensions, &worker_index, logger);
/*
* Check if somebody is feading us with his own TOMCAT data headers.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org