From: Stefan Eissing <icing@apache.org>
Date: Tue, 18 Aug 2015 15:03:37 +0000 (+0000)
Subject: reverted late connection creation after encountering concurrency issues on ubuntu
X-Git-Tag: 2.5.0-alpha~2951
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=523a9e37478a3f3f2829f1b2655cafbfe82fdb45;p=apache

reverted late connection creation after encountering concurrency issues on ubuntu

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1696442 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c
index a9727b0508..db460bd528 100644
--- a/modules/http2/h2_mplx.c
+++ b/modules/http2/h2_mplx.c
@@ -765,10 +765,6 @@ h2_task *h2_mplx_pop_task(h2_mplx *m, int *has_more)
     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 *m, struct h2_stream *stream)
     }
     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);
     }