You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/11/17 12:30:31 UTC
svn commit: r1714756 - in /httpd/httpd/trunk/modules/http2: h2_h2.c
h2_switch.c
Author: icing
Date: Tue Nov 17 11:30:31 2015
New Revision: 1714756
URL: http://svn.apache.org/viewvc?rev=1714756&view=rev
Log:
reverting change re flush
Modified:
httpd/httpd/trunk/modules/http2/h2_h2.c
httpd/httpd/trunk/modules/http2/h2_switch.c
Modified: httpd/httpd/trunk/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_h2.c?rev=1714756&r1=1714755&r2=1714756&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_h2.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_h2.c Tue Nov 17 11:30:31 2015
@@ -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");
Modified: httpd/httpd/trunk/modules/http2/h2_switch.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_switch.c?rev=1714756&r1=1714755&r2=1714756&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_switch.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_switch.c Tue Nov 17 11:30:31 2015
@@ -160,7 +160,6 @@ static int h2_protocol_switch(conn_rec *
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,
"session proessed, unexpected status");
}
- ap_flush_conn(r->connection);
}
return DONE;
}