From: Martin Kraemer <martin@apache.org>
Date: Thu, 30 Aug 2007 16:00:17 +0000 (+0000)
Subject: Revert changes
X-Git-Tag: 2.2.6~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b869a5e0172467720214326602056b3a450ca46c;p=thirdparty%2Fapache%2Fhttpd.git

Revert changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@571220 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index eb78bc3db14..a72d47a55e1 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -51,7 +51,7 @@ static int sc_for_req_header(const char *header_name)
     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 @@ static int sc_for_req_header(const char *header_name)
                     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 @@ static int sc_for_req_header(const char *header_name)
                 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 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
 
     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 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg,
         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,