svn commit: r1771160 - in /httpd/httpd/trunk/modules/http2: h2_mplx.c h2_stream.c

[ic...@apache.org]

Author: icing
Date: Thu Nov 24 14:53:12 2016
New Revision: 1771160

URL: http://svn.apache.org/viewvc?rev=1771160&view=rev
Log:
mod_http2: wseaking cleanup assertion on streams that have never been scheduled

Modified:
    httpd/httpd/trunk/modules/http2/h2_mplx.c
    httpd/httpd/trunk/modules/http2/h2_stream.c

Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1771160&r1=1771159&r2=1771160&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Thu Nov 24 14:53:12 2016
@@ -899,6 +899,7 @@ static h2_task *next_stream_task(h2_mplx
                 h2_slave_run_pre_connection(slave, ap_get_conn_socket(slave));
             }
             stream->started = 1;
+            stream->can_be_cleaned = 0;
             task->worker_started = 1;
             task->started_at = apr_time_now();
             if (sid > m->max_stream_started) {

Modified: httpd/httpd/trunk/modules/http2/h2_stream.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_stream.c?rev=1771160&r1=1771159&r2=1771160&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_stream.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_stream.c Thu Nov 24 14:53:12 2016
@@ -200,6 +200,7 @@ h2_stream *h2_stream_open(int id, apr_po
     stream->state        = H2_STREAM_ST_IDLE;
     stream->pool         = pool;
     stream->session      = session;
+    stream->can_be_cleaned = 1;
 
     h2_beam_create(&stream->input, pool, id, "input", H2_BEAM_OWNER_SEND, 0);
     h2_beam_create(&stream->output, pool, id, "output", H2_BEAM_OWNER_RECV, 0);
@@ -412,6 +413,7 @@ apr_status_t h2_stream_schedule(h2_strea
                 stream->request = stream->rtmp;
                 stream->rtmp = NULL;
                 stream->scheduled = 1;
+
                 stream->push_policy = h2_push_policy_determine(stream->request->headers, 
                                                                stream->pool, push_enabled);