]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
reverting change re flush
authorStefan Eissing <icing@apache.org>
Tue, 17 Nov 2015 11:30:31 +0000 (11:30 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 17 Nov 2015 11:30:31 +0000 (11:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1714756 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_h2.c
modules/http2/h2_switch.c

index 857e3e27c2c592d29f48e769931169f816a43e82..54fe9e0fa0a5631367b8c19c01b829fba8ef04db 100644 (file)
@@ -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");
index 948241356a674e9b704a43009e09c6304e74604a..c107db8e73a40eff93b42138663efbbd1985057a 100644 (file)
@@ -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;
     }