]> granicus.if.org Git - apache/commitdiff
avoid losing a subpool (until restart) on a rare error path
authorJeff Trawick <trawick@apache.org>
Tue, 27 Jan 2004 17:11:04 +0000 (17:11 +0000)
committerJeff Trawick <trawick@apache.org>
Tue, 27 Jan 2004 17:11:04 +0000 (17:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102420 13f79535-47bb-0310-9956-ffa450edef68

server/mpm_common.c

index 32cfa852af806e272ad52e07ec5af93181431eaf..55647c20411b4d25dad41522b648cf9cd0cbb362 100644 (file)
@@ -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;
     }