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/09 15:34:13 UTC
svn commit: r1713442 - in /httpd/httpd/trunk/modules/http2: h2_session.c
h2_task.c
Author: icing
Date: Mon Nov 9 14:34:13 2015
New Revision: 1713442
URL: http://svn.apache.org/viewvc?rev=1713442&view=rev
Log:
some connection state tweaks to appease event mpm
Modified:
httpd/httpd/trunk/modules/http2/h2_session.c
httpd/httpd/trunk/modules/http2/h2_task.c
Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1713442&r1=1713441&r2=1713442&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Mon Nov 9 14:34:13 2015
@@ -1373,8 +1373,10 @@ apr_status_t h2_session_process(h2_sessi
}
if (may_block) {
+ h2_session_flush(session);
if (session->c->cs) {
- session->c->cs->state = CONN_STATE_WRITE_COMPLETION;
+ session->c->cs->state = (got_streams? CONN_STATE_HANDLER
+ : CONN_STATE_WRITE_COMPLETION);
}
status = h2_conn_io_read(&session->io, APR_BLOCK_READ,
session_receive, session);
Modified: httpd/httpd/trunk/modules/http2/h2_task.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?rev=1713442&r1=1713441&r2=1713442&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task.c Mon Nov 9 14:34:13 2015
@@ -397,6 +397,8 @@ static apr_status_t h2_task_process_requ
* will result in a segfault immediately instead
* of nondeterministic failures later.
*/
+ if (cs)
+ cs->state = CONN_STATE_WRITE_COMPLETION;
r = NULL;
}
ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, NULL);