You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/08/02 16:42:39 UTC
svn commit: r1754979 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Author: ylavic
Date: Tue Aug 2 16:42:39 2016
New Revision: 1754979
URL: http://svn.apache.org/viewvc?rev=1754979&view=rev
Log:
mod_proxy_http: 204 or 304 cannot happen here since ap_is_HTTP_ERROR() above
is true.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1754979&r1=1754978&r2=1754979&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Tue Aug 2 16:42:39 2016
@@ -1619,16 +1619,13 @@ int ap_proxy_http_process_response(apr_p
"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. */