Author: timw
Date: Sun Mar 7 21:23:01 2010
New Revision: 920119
URL: http://svn.apache.org/viewvc?rev=920119&view=rev
Log:
Fix #38895 - use ALL_RAW to obtain HTTP headers by default, instead of
ALL_HTTP, which obtains CGI style headers (and does lowercase and '_' -> '-'
conversions on header names).
Old behaviour is available by defining USE_CGI_HEADERS.
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=920119&r1=920118&r2=920119&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Sun Mar 7 21:23:01 2010
@@ -75,7 +75,7 @@
#define WORKER_HEADER_NAME_BASE ("TOMCATWORKER")
#define WORKER_HEADER_INDEX_BASE ("TOMCATWORKERIDX")
#define TOMCAT_TRANSLATE_HEADER_NAME_BASE ("TOMCATTRANSLATE")
-#ifdef USE_RAW_HEADERS
+#ifndef USE_CGI_HEADERS
#define CONTENT_LENGTH ("CONTENT-LENGTH:")
#else
#define CONTENT_LENGTH ("CONTENT_LENGTH:")
@@ -83,7 +83,7 @@
/* The HTTP_ form of the header for use in ExtensionProc */
#define HTTP_HEADER_PREFIX "HTTP_"
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
#define HTTP_HEADER_PREFIX_LEN 5
#endif
@@ -436,7 +436,7 @@
#define STRNULL_FOR_NULL(x) ((x) ? (x) : "(null)")
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
#define JK_TOLOWER(x) ((char)tolower((BYTE)(x)))
#endif
@@ -3127,7 +3127,7 @@
huge_buf_sz = MAX_PACKET_SIZE;
if (get_server_value(private_data->lpEcb,
-#ifdef USE_RAW_HEADERS
+#ifndef USE_CGI_HEADERS
"ALL_RAW", huge_buf, huge_buf_sz)) {
#else
"ALL_HTTP", huge_buf, huge_buf_sz)) {
@@ -3171,7 +3171,7 @@
for (i = 0, tmp = headers_buf; *tmp && i < cnt;) {
int real_header = JK_TRUE;
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
/* Skip the HTTP_ prefix to the beginning of the header name */
tmp += HTTP_HEADER_PREFIX_LEN;
#endif
@@ -3218,7 +3218,7 @@
}
while (':' != *tmp && *tmp) {
-#ifndef USE_RAW_HEADERS
+#ifdef USE_CGI_HEADERS
if (real_header) {
if ('_' == *tmp) {
*tmp = '-';
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
