From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 1 Feb 2017 21:25:26 +0000 (+0000)
Subject: mod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.
X-Git-Tag: 2.5.0-alpha~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5054dfbb96c5994f1388ded5ec8e2c6ddbb5bd2c;p=apache

mod_ssl: follow up to r1740928: fix memory leaks from merged proxy_ctx.



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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 4a8f11a79b..fe37d84bc5 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1615,6 +1615,11 @@ static apr_status_t ssl_init_proxy_ctx(server_rec *s,
 {
     apr_status_t rv;
 
+    if (proxy->ssl_ctx) {
+        /* Merged/initialized already */
+        return APR_SUCCESS;
+    }
+
     apr_pool_cleanup_register(p, proxy,
                               ssl_cleanup_proxy_ctx,
                               apr_pool_cleanup_null);