Merge r572000 from trunk:

* Fix proxy-sendchunk(s|ed) problem.

PR: 43183

Submitted by: Brian Rectanus <Brian.Rectanus breach.com>, Vincent Bray
Reviewed by: niq, rpluem, fielding

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

diff --git a/CHANGES b/CHANGES
index 5df99b90d6f6592fd4badbdb82c89c00db311889..d227a39cf44aa31898126c6f55a7930057842565 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_proxy_http: accept proxy-sendchunked/proxy-sendchunks as synonymous.
+     PR 43183 [Brian Rectanus <Brian.Rectanus breach.com>, Vincent Bray]
+
   *) mod_proxy: Ensure that at least scheme://hostname[:port] matches between
      worker and URL when searching for the best fitting worker for a given URL.
      PR 40910 [Ruediger Pluem]

diff --git a/STATUS b/STATUS
index 1528780296f6df754be1a720c0f0de60a7d41bad..5f148f488c1af88dab3eb05e0c072b9affada920 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,14 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_http: make proxy-sendchunked work as documented.
-     PR 43183
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=572000&view=rev
-      2.2 version: noodl's patch at
-         http://issues.apache.org/bugzilla/attachment.cgi?id=20699
-     +1: niq, rpluem, fielding
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 47d8f91198b3399f4d8d11b845afd89c31cf9616..534cbb5d43dbcf1341050013e3a6abd9390f4d83 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -954,7 +954,8 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
     else if (old_te_val) {
         if (force10
              || (apr_table_get(r->subprocess_env, "proxy-sendcl")
-                  && !apr_table_get(r->subprocess_env, "proxy-sendchunks"))) {
+                  && !apr_table_get(r->subprocess_env, "proxy-sendchunks")
+                  && !apr_table_get(r->subprocess_env, "proxy-sendchunked"))) {
             rb_method = RB_SPOOL_CL;
         }
         else {
@@ -966,7 +967,8 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
             rb_method = RB_STREAM_CL;
         }
         else if (!force10
-                  && apr_table_get(r->subprocess_env, "proxy-sendchunks")
+                  && (apr_table_get(r->subprocess_env, "proxy-sendchunks")
+                      || apr_table_get(r->subprocess_env, "proxy-sendchunked"))
                   && !apr_table_get(r->subprocess_env, "proxy-sendcl")) {
             rb_method = RB_STREAM_CHUNKED;
         }