From: Jeff Trawick <trawick@apache.org>
Date: Tue, 27 Jan 2004 17:11:04 +0000 (+0000)
Subject: avoid losing a subpool (until restart) on a rare error path
X-Git-Tag: pre_ajp_proxy~762
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b924ca508afc78d8e1c080766ca3a2c77cd239c8;p=apache

avoid losing a subpool (until restart) on a rare error path


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

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 32cfa852af..55647c2041 100644
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -492,6 +492,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                      "get socket to connect to listener");
+        apr_pool_destroy(p);
         return rv;
     }
 
@@ -506,6 +507,7 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
                      "set timeout on socket to connect to listener");
         apr_socket_close(sock);
+        apr_pool_destroy(p);
         return rv;
     }