httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r662013 - /httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
Date Sat, 31 May 2008 11:58:20 GMT
Author: jim
Date: Sat May 31 04:58:20 2008
New Revision: 662013

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

* server/mpm/prefork/prefork.c (child_main): Unlock the mutex before
  terminating in the multi-listener poll error path.

Submitted by: jorton
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c

Modified: httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c?rev=662013&r1=662012&r2=662013&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/prefork/prefork.c Sat May 31 04:58:20 2008
@@ -590,6 +590,7 @@
                      */
                     ap_log_error(APLOG_MARK, APLOG_ERR, status,
                                  ap_server_conf, "apr_pollset_poll: (listen)");
+                    SAFE_ACCEPT(accept_mutex_off());
                     clean_child_exit(1);
                 }
 



Mime
View raw message