mod_proxy_http: 204 or 304 cannot happen here since ap_is_HTTP_ERROR() above

is true.

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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index ff8157bb0eca98f954a6e52b4a35c774b03de673..f5731652bf8f858bc011d84672412c48a23a8f14 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1619,16 +1619,13 @@ int ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                                   "WWW-Authenticate header");
                 }
             }
-
             /* clear r->status for override error, otherwise ErrorDocument
              * thinks that this is a recursive error, and doesn't find the
              * custom error page
              */
             r->status = HTTP_OK;
-            /* Discard body, if one is expected */
-            if (!r->header_only && /* not HEAD request */
-                (proxy_status != HTTP_NO_CONTENT) && /* not 204 */
-                (proxy_status != HTTP_NOT_MODIFIED)) { /* not 304 */
+            /* Discard body, if one is expected (not HEAD request) */
+            if (!r->header_only) {
                 const char *tmp;
                 /* Add minimal headers needed to allow http_in filter
                  * detecting end of body without waiting for a timeout. */