From: Jim Jagielski <jim@apache.org>
Date: Sat, 31 May 2008 11:58:20 +0000 (+0000)
Subject: Merge r613252 from trunk:
X-Git-Tag: 2.2.9~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c372b49b228f68b134b900508b632eb9fe1a16;p=thirdparty%2Fapache%2Fhttpd.git

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


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ada2990fc3a..404686d972f 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -590,6 +590,7 @@ static void child_main(int child_num_arg)
                      */
                     ap_log_error(APLOG_MARK, APLOG_ERR, status,
                                  ap_server_conf, "apr_pollset_poll: (listen)");
+                    SAFE_ACCEPT(accept_mutex_off());
                     clean_child_exit(1);
                 }