*) mod_http2: use new ap_sb_get_child_thread() to get child_num

     and create unique h2 session identifiers in logging that stay
     unique among re-activations of the master connection.



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

1 files changed, 0 insertions, 17 deletions

diff --git a/modules/http2/mod_http2.c b/modules/http2/mod_http2.c
index e7f1002912..4aa5155d77 100644
--- a/modules/http2/mod_http2.c
+++ b/modules/http2/mod_http2.c
@@ -158,25 +158,8 @@ static void http2_get_num_workers(server_rec *s, int *minw, int *maxw)
  */
 static void h2_child_init(apr_pool_t *pchild, server_rec *s)
 {
-    apr_allocator_t *allocator;
-    apr_thread_mutex_t *mutex;
     apr_status_t rv;
 
-    /* The allocator of pchild has no mutex with MPM prefork, but we need one
-     * for h2 workers threads synchronization. Even though mod_http2 shouldn't
-     * be used with prefork, better be safe than sorry, so forcibly set the
-     * mutex here. For MPM event/worker, pchild has no allocator so pconf's
-     * is used, with its mutex.
-     */
-    allocator = apr_pool_allocator_get(pchild);
-    if (allocator) {
-        mutex = apr_allocator_mutex_get(allocator);
-        if (!mutex) {
-            apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pchild);
-            apr_allocator_mutex_set(allocator, mutex);
-        }
-    }
-
     /* Set up our connection processing */
     rv = h2_c1_child_init(pchild, s);
     if (APR_SUCCESS == rv) {