From: Daniel Ruggeri <druggeri@apache.org>
Date: Wed, 8 Feb 2012 21:02:20 +0000 (+0000)
Subject: Add cleanup for SSLProxyMachineCertificateChainFile during init
X-Git-Tag: 2.5.0-alpha~7487
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=104e5a433c7ee3ccd828bcc078e05bd0fb135caa;p=apache

Add cleanup for SSLProxyMachineCertificateChainFile during init

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

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 98ba6a240e..acaf5d5077 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -1636,6 +1636,17 @@ static void ssl_init_ctx_cleanup_proxy(modssl_ctx_t *mctx)
     ssl_init_ctx_cleanup(mctx);
 
     if (mctx->pkp->certs) {
+        int i = 0;
+        int ncerts = sk_X509_INFO_num(mctx->pkp->certs);
+
+        if (mctx->pkp->ca_certs) {
+            for (i = 0; i < ncerts; i++) {
+                if (mctx->pkp->ca_certs[i] != NULL) {
+                    sk_X509_pop_free(mctx->pkp->ca_certs[i], X509_free);
+                }
+            }
+        }
+
         sk_X509_INFO_pop_free(mctx->pkp->certs, X509_INFO_free);
         mctx->pkp->certs = NULL;
     }