You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ti...@apache.org on 2011/04/11 10:03:18 UTC
svn commit: r1090965 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Author: timw
Date: Mon Apr 11 08:03:18 2011
New Revision: 1090965
URL: http://svn.apache.org/viewvc?rev=1090965&view=rev
Log:
Fix header processing when ISAPI Redirector is used in extension only mode (legacy).
Redirector headers are not present when HttpFilterProc is bypassed, but the code assumes they are.
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=47679
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=1090965&r1=1090964&r2=1090965&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Apr 11 08:03:18 2011
@@ -3180,11 +3180,6 @@ static int init_ws_service(isapi_private
need_content_length_header = TRUE;
}
- cnt -= 3; /* For our three special headers:
- * HTTP_TOMCATURI_XXXXXXXX
- * HTTP_TOMCATWORKER_XXXXXXXX
- * HTTP_TOMCATWORKERIDX_XXXXXXXX
- */
/* allocate an extra header slot in case we need to add a content-length header */
s->headers_names =
jk_pool_alloc(&private_data->p, (cnt + 1) * sizeof(char *));
@@ -3206,15 +3201,9 @@ static int init_ws_service(isapi_private
if (!strnicmp(tmp, URI_HEADER_NAME, strlen(URI_HEADER_NAME))
|| !strnicmp(tmp, WORKER_HEADER_NAME, strlen(WORKER_HEADER_NAME))
- || !strnicmp(tmp, WORKER_HEADER_INDEX, strlen(WORKER_HEADER_INDEX))) {
+ || !strnicmp(tmp, WORKER_HEADER_INDEX, strlen(WORKER_HEADER_INDEX))
+ || !strnicmp(tmp, QUERY_HEADER_NAME, strlen(QUERY_HEADER_NAME))) {
/* Skip redirector headers */
- real_header = JK_FALSE;
- }
- else if (!strnicmp(tmp, QUERY_HEADER_NAME,
- strlen(QUERY_HEADER_NAME))) {
- /* HTTP_TOMCATQUERY_XXXXXXXX was supplied,
- * remove it from the count and skip
- */
cnt--;
real_header = JK_FALSE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org