mturk 2005/09/22 23:35:10
Modified: jk/native/iis jk_isapi_plugin.c
Log:
Use simple Translate header for multiple instances.
Patch provided by Tim Whittington fixes #35298.
Revision Changes Path
1.54 +7 -4 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- jk_isapi_plugin.c 14 Sep 2005 10:52:43 -0000 1.53
+++ jk_isapi_plugin.c 23 Sep 2005 06:35:10 -0000 1.54
@@ -79,6 +79,10 @@
#define URI_SELECT_UNPARSED_VERB ("unparsed")
#define URI_SELECT_ESCAPED_VERB ("escaped")
+#define TRANSLATE_HEADER ("Translate:")
+#define TRANSLATE_HEADER_NAME ("Translate")
+#define TRANSLATE_HEADER_NAME_LC ("translate")
+
#define BAD_REQUEST -1
#define BAD_PATH -2
#define MAX_SERVERNAME 128
@@ -907,7 +911,7 @@
* This allows the servlet to handle 'Translate: f'.
*/
if (GetHeader
- (pfc, "Translate:", (LPVOID) Translate,
+ (pfc, TRANSLATE_HEADER, (LPVOID) Translate,
(LPDWORD) & szTranslate) && Translate != NULL
&& szTranslate > 0) {
if (!AddHeader
@@ -1555,8 +1559,7 @@
}
else if (!strnicmp(tmp, TOMCAT_TRANSLATE_HEADER_NAME,
strlen(TOMCAT_TRANSLATE_HEADER_NAME))) {
- tmp += 6; /* TOMCAT */
- s->headers_names[i] = tmp;
+ s->headers_names[i] = TRANSLATE_HEADER_NAME_LC;
}
else {
s->headers_names[i] = tmp;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
