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.

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

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index 2fc0801ef396e864365dc52b3355e3381344058a..2a760fcb0255c74398215d97e2424ae3f9661ec6 100644 (file)
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -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)