]> granicus.if.org Git - apache/commitdiff
joining zombie workers thread, as suggested by yann
authorStefan Eissing <icing@apache.org>
Mon, 4 Jan 2016 16:26:18 +0000 (16:26 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 4 Jan 2016 16:26:18 +0000 (16:26 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722914 13f79535-47bb-0310-9956-ffa450edef68

modules/http2/h2_worker.c

index 9af2cd11dc1d61ddeda623899274462a135ca3b0..f3f2b9b5c09ced0e44e376f4729481f3b9de7d5f 100644 (file)
@@ -160,6 +160,11 @@ apr_status_t h2_worker_destroy(h2_worker *worker)
         apr_thread_cond_destroy(worker->io);
         worker->io = NULL;
     }
+    if (worker->thread) {
+        apr_status_t status;
+        apr_thread_join(&status, worker->thread);
+        worker->thread = NULL;
+    }
     if (worker->pool) {
         apr_pool_destroy(worker->pool);
         /* worker is gone */