httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1301649 - in /httpd/httpd/branches/2.4.x: CHANGES server/mpm_unix.c
Date Fri, 16 Mar 2012 17:03:26 GMT
Author: jorton
Date: Fri Mar 16 17:03:26 2012
New Revision: 1301649

URL: http://svn.apache.org/viewvc?rev=1301649&view=rev
Log:
Merge r1300171 from trunk:

* server/mpm_unix.c (dummy_connection): Destroy temp pool and return
  on connect() failure.

Reviewed by: jim, trawick, jorton

[added user-incomprehensible CHANGES entry as directed ;) ]

Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/server/mpm_unix.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1301649&r1=1301648&r2=1301649&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Mar 16 17:03:26 2012
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) Unix MPMs: Fix small memory leak in parent process if connect()
+     failed when waking up children.  [Joe Orton]
+
   *) "DirectoryIndex disabled" now undoes DirectoryIndex settings in
      the current configuration section, not just previous config sections.
      PR52845 [Eric Covener]

Modified: httpd/httpd/branches/2.4.x/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_unix.c?rev=1301649&r1=1301648&r2=1301649&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm_unix.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm_unix.c Fri Mar 16 17:03:26 2012
@@ -569,6 +569,8 @@ static apr_status_t dummy_connection(ap_
 
         ap_log_error(APLOG_MARK, log_level, rv, ap_server_conf, APLOGNO(00056)
                      "connect to listener on %pI", lp->bind_addr);
+        apr_pool_destroy(p);
+        return rv;
     }
 
     /* Create the request string. We include a User-Agent so that



Mime
View raw message