core: (dummy_connection): Destroy tmp pool and

return on connect() failure. Fixes small memory
leak for Unix MPMs in parent process if connect()
failed when waking up children.

Backport of r1300171 from trunk resp. r1301649 from 2.4.x.

Submitted by: jorton
Reviewed by: trawick, wrowe
Backported by: rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1374537 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index fdf2524dfab8d055c540c221a3939c8d69a0084d..1d25ba6a36ff8411c567199052b83d36f2191740 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
      possible XSS for a site where untrusted users can upload files to
      a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
 
+  *) Unix MPMs: Fix small memory leak in parent process if connect()
+     failed when waking up children.  [Joe Orton]
+
   *) mod_proxy_ajp: Add support for 'ProxyErrorOverride on'. PR 50945.
      [Peter Pramberger <peter pramberger.at>, Jim Jagielski]
 

diff --git a/STATUS b/STATUS
index ca180d3cf6f008d03d0149d3247fe78a405aefe3..913860f5e9f926b6ac57835cef9c6c252d6efb06 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -93,12 +93,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: (dummy_connection): Destroy tmp pool and return on connect() failure.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1300171
-     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1301649
-     2.2.x patch: http://people.apache.org/~rjung/patches/dummy_connection-destroy-pool-and-return-on-failure-2_2.patch
-     +1: rjung, trawick, wrowe
-
    * mod_log_config: %{abc}C truncates cookies whose values contain '='
      PR 53104
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1328133

diff --git a/server/mpm_common.c b/server/mpm_common.c
index 754fc643388220f4ab27bc5d8f67c31ff55ece0e..eb59407f14a0ad3f516a9b2b375a8ab8f875b6ae 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -693,6 +693,8 @@ static apr_status_t dummy_connection(ap_pod_t *pod)
 
         ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf,
                      "connect to listener on %pI", ap_listeners->bind_addr);
+        apr_pool_destroy(p);
+        return rv;
     }
 
     /* Create the request string. We include a User-Agent so that