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 4a8f11a79ba6788b4aa73a23798d8306720ea2ee..fe37d84bc5a5ba25e33e2f1124c15faa1f0822e2 100644 (file)
--- 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);