You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by el...@apache.org on 2016/08/02 17:22:44 UTC
svn commit: r1754983 - /httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Author: elukey
Date: Tue Aug 2 17:22:44 2016
New Revision: 1754983
URL: http://svn.apache.org/viewvc?rev=1754983&view=rev
Log:
Revert r1754732,r1754734,r1754736 after a conversation on dev@ and IRC.
We agreed to consider r1752347 as bug fix and delay performance improvements
for later revisions.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=1754983&r1=1754982&r2=1754983&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Tue Aug 2 17:22:44 2016
@@ -661,25 +661,14 @@ recv_again:
break;
}
else if (status == HTTP_NOT_MODIFIED) {
- /* A 304 response MUST NOT contain
- * a message-body, so we must ignore it but
- * some extra steps need to be taken to
- * avoid inconsistencies.
- * The break is not added with connection
- * reuse set since there might be more bytes
- * to read like the message-body, that would
- * trigger subsequent bogus reads (for example
- * the start of the message-body
- * interpreted as a FCGI header).
- * With connection reuse disabled (default)
- * we can safely break and force the end
- * of the FCGI processing phase since the
- * connection will be cleaned up later on. */
+ /* The 304 response MUST NOT contain
+ * a message-body, ignore it.
+ * The break is not added since there might
+ * be more bytes to read from the FCGI
+ * connection. Even if the message-body is
+ * ignored we want to avoid subsequent
+ * bogus reads. */
ignore_body = 1;
- if (conn->close) {
- done = 1;
- break;
- }
}
else {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01070)