[httpd] pull upstream patch r1392850 in addition to r1387633

[jorton]

commit c6e80d081afb96d58b983ac1a441887609b2ce88
Author: Joe Orton <jorton at redhat.com>
Date:   Wed Oct 3 13:50:44 2012 +0100

    pull upstream patch r1392850 in addition to r1387633

 ...2-r1387633.patch => httpd-2.4.3-r1387633+.patch |   14 +++++++++-----
 httpd.spec                                         |    7 +++++--
 2 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/httpd-2.4.2-r1387633.patch b/httpd-2.4.3-r1387633+.patch
similarity index 68%
rename from httpd-2.4.2-r1387633.patch
rename to httpd-2.4.3-r1387633+.patch
index 3fc0143..b09b338 100644
--- a/httpd-2.4.2-r1387633.patch
+++ b/httpd-2.4.3-r1387633+.patch
@@ -1,15 +1,17 @@
-# ./pullrev.sh 1387633
+# ./pullrev.sh 1387633 1392850
 
 http://svn.apache.org/viewvc?view=revision&revision=1387633
+http://svn.apache.org/viewvc?view=revision&revision=1392850
 
---- httpd-2.4.2/server/mpm/prefork/prefork.c
-+++ httpd-2.4.2/server/mpm/prefork/prefork.c
-@@ -564,8 +564,14 @@
+--- httpd-2.4.3/server/mpm/prefork/prefork.c
++++ httpd-2.4.3/server/mpm/prefork/prefork.c
+@@ -564,9 +564,16 @@
  
          status = apr_pollset_add(pollset, &pfd);
          if (status != APR_SUCCESS) {
 -            ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157)
 -                         "Couldn't add listener to pollset; check system or user limits");
+-            clean_child_exit(APEXIT_CHILDSICK);
 +            /* If the child processed a SIGWINCH before setting up the
 +             * pollset, this error path is expected and harmless,
 +             * since the listener fd was already closed; so don't
@@ -17,7 +19,9 @@ http://svn.apache.org/viewvc?view=revision&revision=1387633
 +            if (!die_now) {
 +                ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(00157)
 +                             "Couldn't add listener to pollset; check system or user limits");
++                clean_child_exit(APEXIT_CHILDSICK);
 +            }
-             clean_child_exit(APEXIT_CHILDSICK);
++            clean_child_exit(0);
          }
  
+         lr->accept_func = ap_unixd_accept;
diff --git a/httpd.spec b/httpd.spec
index dde0730..a5584e0 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -52,7 +52,7 @@ Patch28: httpd-2.4.2-r1332643+.patch
 Patch29: httpd-2.4.3-mod_systemd.patch
 # Bug fixes
 Patch50: httpd-2.4.2-r1374214+.patch
-Patch51: httpd-2.4.2-r1387633.patch
+Patch51: httpd-2.4.3-r1387633+.patch
 License: ASL 2.0
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -574,6 +574,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Wed Oct  3 2012 Joe Orton <jorton at redhat.com> - 2.4.3-10
+- pull upstream patch r1392850 in addition to r1387633
+
 * Mon Oct  1 2012 Joe Orton <jorton at redhat.com> - 2.4.3-9
 - define PLATFORM in os.h using vendor string