From: Yann Ylavic Date: Tue, 2 Aug 2016 16:42:39 +0000 (+0000) Subject: mod_proxy_http: 204 or 304 cannot happen here since ap_is_HTTP_ERROR() above X-Git-Tag: 2.5.0-alpha~1342 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d46ecdbe4978f36aac93705aea407bebed3c0ca;p=apache 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 ff8157bb0e..f5731652bf 100644 --- 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. */