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/10/26 14:48:13 UTC
svn commit: r1710597 - /httpd/httpd/trunk/modules/http2/h2_conn.c
Author: icing
Date: Mon Oct 26 13:48:13 2015
New Revision: 1710597
URL: http://svn.apache.org/viewvc?rev=1710597&view=rev
Log:
fix for null connection states
Modified:
httpd/httpd/trunk/modules/http2/h2_conn.c
Modified: httpd/httpd/trunk/modules/http2/h2_conn.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_conn.c?rev=1710597&r1=1710596&r2=1710597&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_conn.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_conn.c Mon Oct 26 13:48:13 2015
@@ -283,11 +283,15 @@ static apr_status_t h2_conn_loop(h2_sess
*/
got_streams = !h2_stream_set_is_empty(session->streams);
if (!got_streams || session->frames_received <= 1) {
- session->c->cs->state = CONN_STATE_WRITE_COMPLETION;
+ if (session->c->cs) {
+ session->c->cs->state = CONN_STATE_WRITE_COMPLETION;
+ }
status = h2_session_read(session, APR_BLOCK_READ);
}
else {
- session->c->cs->state = CONN_STATE_HANDLER;
+ if (session->c->cs) {
+ session->c->cs->state = CONN_STATE_HANDLER;
+ }
status = h2_session_read(session, APR_NONBLOCK_READ);
}