From: Jim Jagielski <jim@apache.org>
Date: Mon, 6 Jul 2009 16:53:20 +0000 (+0000)
Subject: Merge r785661 from trunk:
X-Git-Tag: 2.2.12~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9b481e62b853f3c0de04784c05c3aba5f5bc06;p=thirdparty%2Fapache%2Fhttpd.git

Merge r785661 from trunk:

mod_proxy_http: fix case sensitivity checking transfer encoding
PR 47383 [Ryuzo Yamamoto]


Submitted by: niq
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 8aef4dddb53..16bf4246de0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,9 @@ Changes with Apache 2.2.12
      different security issues which may affect particular configurations
      and third-party modules.
 
+  *) mod_proxy_http: fix case sensitivity checking transfer encoding
+     PR 47383 [Ryuzo Yamamoto <ryuzo.yamamoto gmail.com>]
+
   *) mod_rewrite: Fix the error string returned by RewriteRule.
      RewriteRule returned "RewriteCond: bad flag delimiters" when the 3rd
      argument of RewriteRule was not started with "[" or not ended with "]".
diff --git a/STATUS b/STATUS
index 70724b10f38..2ae4e777be1 100644
--- a/STATUS
+++ b/STATUS
@@ -96,11 +96,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    configs thought by their users to be working.
    +1: niq, rpluem, jim
 
- * mod_proxy_http: fix case sensitivity checking transfer encoding
-   PR 47383
-   Patch: http://svn.apache.org/viewvc?view=rev&revision=785661
-   +1: niq, rpluem, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index ae7fd08ba0b..caa7e5c5427 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -944,7 +944,7 @@ int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
      * encoding has been done by the extensions' handler, and
      * do not modify add_te_chunked's logic
      */
-    if (old_te_val && strcmp(old_te_val, "chunked") != 0) {
+    if (old_te_val && strcasecmp(old_te_val, "chunked") != 0) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "proxy: %s Transfer-Encoding is not supported",
                      old_te_val);