httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1696442 - /httpd/httpd/trunk/modules/http2/h2_mplx.c
Date Tue, 18 Aug 2015 15:03:37 GMT
Author: icing
Date: Tue Aug 18 15:03:37 2015
New Revision: 1696442

URL: http://svn.apache.org/r1696442
Log:
reverted late connection creation after encountering concurrency issues on ubuntu

Modified:
    httpd/httpd/trunk/modules/http2/h2_mplx.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=1696442&r1=1696441&r2=1696442&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Tue Aug 18 15:03:37 2015
@@ -765,10 +765,6 @@ h2_task *h2_mplx_pop_task(h2_mplx *m, in
     if (APR_SUCCESS == status) {
         task = h2_tq_pop_first(m->q);
         if (task) {
-            h2_io *io = h2_io_set_get(m->stream_ios, task->stream_id);
-            if (io) {
-                task->c = h2_conn_create(m->c, io->pool);
-            }
             h2_task_set_started(task);
         }
         *has_more = !h2_tq_empty(m->q);
@@ -786,8 +782,9 @@ apr_status_t h2_mplx_create_task(h2_mplx
     }
     status = apr_thread_mutex_lock(m->lock);
     if (APR_SUCCESS == status) {
+        conn_rec *c = h2_conn_create(m->c, stream->pool);
         stream->task = h2_task_create(m->id, stream->id, 
-                                      stream->pool, m, NULL);
+                                      stream->pool, m, c);
         
         apr_thread_mutex_unlock(m->lock);
     }



Mime
View raw message