From: Rainer Jung <rjung@apache.org>
Date: Mon, 25 Aug 2014 13:44:03 +0000 (+0000)
Subject: Switch preference for headers, Transfer-Encoding
X-Git-Tag: 2.5.0-alpha~3869
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5002fd13e793bae3485d0febb29e9e9df77eae67;p=apache

Switch preference for headers, Transfer-Encoding
first, Content-Length second.

Addition to r1615289.


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index f8813691f1..a8d9c18004 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1640,12 +1640,12 @@ int ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                 const char *tmp;
                 /* Add minimal headers needed to allow http_in filter
                  * detecting end of body without waiting for a timeout. */
-                if ((tmp = apr_table_get(r->headers_out, "Content-Length"))) {
-                    apr_table_set(backend->r->headers_in, "Content-Length", tmp);
-                }
-                else if ((tmp = apr_table_get(r->headers_out, "Transfer-Encoding"))) {
+                if ((tmp = apr_table_get(r->headers_out, "Transfer-Encoding"))) {
                     apr_table_set(backend->r->headers_in, "Transfer-Encoding", tmp);
                 }
+                else if ((tmp = apr_table_get(r->headers_out, "Content-Length"))) {
+                    apr_table_set(backend->r->headers_in, "Content-Length", tmp);
+                }
                 else if (te) {
                     apr_table_set(backend->r->headers_in, "Transfer-Encoding", te);
                 }