You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2007/08/30 18:00:17 UTC
svn commit: r571220 - /httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
Author: martin
Date: Thu Aug 30 09:00:17 2007
New Revision: 571220
URL: http://svn.apache.org/viewvc?rev=571220&view=rev
Log:
Revert changes
Modified:
httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
Modified: httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c?rev=571220&r1=571219&r2=571220&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/ajp_header.c Thu Aug 30 09:00:17 2007
@@ -51,7 +51,7 @@
const char *p = header_name;
int i = 0;
- /* ACCEPT-LANGUAGE is the longest header
+ /* ACCEPT-LANGUAGE is the longest headeer
* that is of interest.
*/
if (len < 4 || len > 15)
@@ -69,11 +69,11 @@
return SC_ACCEPT;
else if (header[6] == '-') {
p += 6;
- if (strcmp(p, "CHARSET") == 0)
+ if (memcmp(p, "CHARSET", 7) == 0)
return SC_ACCEPT_CHARSET;
- else if (strcmp(p, "ENCODING") == 0)
+ else if (memcmp(p, "ENCODING", 8) == 0)
return SC_ACCEPT_ENCODING;
- else if (strcmp(p, "LANGUAGE") == 0)
+ else if (memcmp(p, "LANGUAGE", 8) == 0)
return SC_ACCEPT_LANGUAGE;
else
return UNKNOWN_METHOD;
@@ -81,45 +81,45 @@
else
return UNKNOWN_METHOD;
}
- else if (strcmp(p, "UTHORIZATION") == 0)
+ else if (memcmp(p, "UTHORIZATION", 12) == 0)
return SC_AUTHORIZATION;
else
return UNKNOWN_METHOD;
break;
case 'C':
- if(strcmp(p, "OOKIE2") == 0)
+ if(memcmp(p, "OOKIE2", 6) == 0)
return SC_COOKIE2;
- else if (strcmp(p, "OOKIE") == 0)
+ else if (memcmp(p, "OOKIE", 5) == 0)
return SC_COOKIE;
- else if(strcmp(p, "ONNECTION") == 0)
+ else if(memcmp(p, "ONNECTION", 9) == 0)
return SC_CONNECTION;
- else if(strcmp(p, "ONTENT-TYPE") == 0)
+ else if(memcmp(p, "ONTENT-TYPE", 11) == 0)
return SC_CONTENT_TYPE;
- else if(strcmp(p, "ONTENT-LENGTH") == 0)
+ else if(memcmp(p, "ONTENT-LENGTH", 13) == 0)
return SC_CONTENT_LENGTH;
else
return UNKNOWN_METHOD;
break;
case 'H':
- if(strcmp(p, "OST") == 0)
+ if(memcmp(p, "OST", 3) == 0)
return SC_HOST;
else
return UNKNOWN_METHOD;
break;
case 'P':
- if(strcmp(p, "RAGMA") == 0)
+ if(memcmp(p, "RAGMA", 5) == 0)
return SC_PRAGMA;
else
return UNKNOWN_METHOD;
break;
case 'R':
- if(strcmp(p, "EFERER") == 0)
+ if(memcmp(p, "EFERER", 6) == 0)
return SC_REFERER;
else
return UNKNOWN_METHOD;
break;
case 'U':
- if(strcmp(p, "SER-AGENT") == 0)
+ if(memcmp(p, "SER-AGENT", 9) == 0)
return SC_USER_AGENT;
else
return UNKNOWN_METHOD;
@@ -473,11 +473,10 @@
rc = ajp_msg_get_string(msg, &ptr);
if (rc == APR_SUCCESS) {
-#if defined(AS400) || defined(_OSD_POSIX) /* EBCDIC platforms */
- ptr = apr_pstrdup(r->pool, ptr);
- ap_xlate_proto_from_ascii(ptr, strlen(ptr));
-#endif
r->status_line = apr_psprintf(r->pool, "%d %s", status, ptr);
+#if defined(AS400) || defined(_OSD_POSIX)
+ ap_xlate_proto_from_ascii(r->status_line, strlen(r->status_line));
+#endif
} else {
r->status_line = NULL;
}
@@ -562,7 +561,7 @@
apr_table_add(r->headers_out, stringname, value);
/* Content-type needs an additional handling */
- if (strncasecmp(stringname, "Content-Type", 12) == 0) {
+ if (memcmp(stringname, "Content-Type", 12) == 0) {
/* add corresponding filter */
ap_set_content_type(r, apr_pstrdup(r->pool, value));
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,