- backport fix for upstream bug 49058

diff --git a/apache-bug-49058.patch b/apache-bug-49058.patch
new file mode 100644 (file)
index 0000000..b734fbf
--- /dev/null
+++ b/apache-bug-49058.patch
@@ -0,0 +1,18 @@
+--- httpd-2.2.24/os/unix/unixd.c~      2011-02-14 21:18:20.000000000 +0100
++++ httpd-2.2.24/os/unix/unixd.c       2013-04-09 15:56:56.967132150 +0200
+@@ -650,6 +650,15 @@
+             return APR_EGENERAL;
+ #else
+         default:
++           /* If the socket has been closed in ap_close_listeners()
++             * by the restart/stop action, we may get EBADF.
++             * Do not print an error in this case.
++             */
++            if (!lr->active) {
++                ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf,
++                             "apr_socket_accept failed for inactive listener");
++                return status;
++            } 
+             ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf,
+                          "apr_socket_accept: (client socket)");
+             return APR_EGENERAL;

diff --git a/apache.spec b/apache.spec
index 4f34bf6382e5745b5576320c140aa9e5a0f4cbdb..ad932b3910170a56c782e30a03562c089c7072b2 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -85,6 +85,7 @@ Patch1:               %{name}-layout.patch
 Patch2:                %{name}-suexec.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-apr.patch
+Patch5:                apache-bug-49058.patch
 # what about this? it isn't applied...
 Patch6:                httpd-2.0.40-xfsz.patch
 Patch7:                %{name}-syslibs.patch
@@ -1780,6 +1781,8 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1