From: Stefan Eissing <icing@apache.org>
Date: Tue, 17 Nov 2015 11:30:31 +0000 (+0000)
Subject: reverting change re flush
X-Git-Tag: 2.5.0-alpha~2641
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce926e4660ea51ff499af3a496b96c041ecc3ff4;p=thirdparty%2Fapache%2Fhttpd.git

reverting change re flush

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

diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c
index 857e3e27c2c..54fe9e0fa0a 100644
--- a/modules/http2/h2_h2.c
+++ b/modules/http2/h2_h2.c
@@ -648,14 +648,10 @@ int h2_h2_process_conn(conn_rec* c)
      * the connection.
      */
     if (h2_ctx_is_active(ctx)) {
-        apr_status_t status;
-        
         ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c,
                       "h2_h2, connection, h2 active");
         
-        status = h2_conn_process(c, NULL);
-        ap_flush_conn(c);
-        return status;
+        return h2_conn_process(c, NULL);
     }
     
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "h2_h2, declined");
diff --git a/modules/http2/h2_switch.c b/modules/http2/h2_switch.c
index 948241356a6..c107db8e73a 100644
--- a/modules/http2/h2_switch.c
+++ b/modules/http2/h2_switch.c
@@ -160,7 +160,6 @@ static int h2_protocol_switch(conn_rec *c, request_rec *r, server_rec *s,
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,
                               "session proessed, unexpected status");
             }
-            ap_flush_conn(r->connection);
         }
         return DONE;
     }