Fix proxy-sendchunk(s|ed) problem

PR 43183

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@572000 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0c8cc971af29dddaa7ebb71813c661983e488e0e..7625ae712fe60b8b1d7c4af2355a163a6c194e3a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_proxy_http: accept proxy-sendchunked/proxy-sendchunks as synonymous.
+     PR 43183 [Brian Rectanus <Brian.Rectanus breach.com>, Vincent Bray]
+
   *) mod_include: Add an "if" directive syntax to test whether an URL
      is accessible, and if so, conditionally display content. This
      allows a webmaster to hide a link to a private page when the user

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index ba3cb70e321bdb6e8973541dafc19d730c281a7d..1654cd76b14f03411f8f02801c9e3d5b1bc8c743 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -947,7 +947,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 {
@@ -959,7 +960,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;
         }