Fix PR 43183

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

diff --git a/CHANGES b/CHANGES
index 011991be234c3d7e30c53e5ba592bba426af56f6..d5b9081c0ecfc62efbf802266bf326279399578c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,9 @@ Changes with Apache 2.0.61
      be forced to kill processes outside its process group. 
      [Joe Orton, Jim Jagielski]
 
+  *) mod_proxy_http: accept proxy-sendchunked/proxy-sendchunks as synonymous.
+     PR 43183 [Brian Rectanus <Brian.Rectanus breach.com>, Vincent Bray]
+
   *) log core: ensure we use a special pool for stderr logging, so that
      the stderr channel remains valid from the time plog is destroyed,
      until the time the open_logs hook is called again.  [William Rowe]

diff --git a/STATUS b/STATUS
index 70b8be2ea0d3a7d8292000f4a929ef99a1e99e22..07c4f5460d9c31168f4ab1e88c423c6e8bc7679e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,13 +116,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.0 version: noodl's patch at
-         http://issues.apache.org/bugzilla/attachment.cgi?id=20700
-      +1: niq, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index acdddaefe2f41c330fd040c26283bb1508618c85..6cc187dbcd3fe1953e9c6fc1b09c18adeded262e 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -1211,7 +1211,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 {
@@ -1223,7 +1224,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;
         }