[packages/apache] - up to 2.4.9; fixes CVE-2014-0098, CVE-2013-6438; dummy-connection merged upstream

[arekm]

commit c740e9705fd81b9676f0c414b5d9183ff35531de
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 16 18:30:45 2014 +0100

    - up to 2.4.9; fixes CVE-2014-0098, CVE-2013-6438; dummy-connection merged upstream

 apache.spec                         |  8 +++-----
 httpd-dummy-connection-result.patch | 17 -----------------
 2 files changed, 3 insertions(+), 22 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 5202412..abe8e58 100644
--- a/apache.spec
+++ b/apache.spec
@@ -33,12 +33,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.4.7
-Release:	2
+Version:	2.4.9
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	170d7fb6fe5f28b87d1878020a9ab94e
+# Source0-md5:	2ef4e65353497606b24fa9bb3e5a3c40
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -75,7 +75,6 @@ Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-apr.patch
-Patch5:		httpd-dummy-connection-result.patch
 
 Patch7:		%{name}-syslibs.patch
 
@@ -2612,7 +2611,6 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %patch7 -p1
 
diff --git a/httpd-dummy-connection-result.patch b/httpd-dummy-connection-result.patch
deleted file mode 100644
index 81f0f08..0000000
--- a/httpd-dummy-connection-result.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/server/mpm_unix.c b/server/mpm_unix.c
-index a70c271..ca880e5 100644
---- a/server/mpm_unix.c
-+++ b/server/mpm_unix.c
-@@ -742,7 +742,12 @@ void ap_mpm_pod_killpg(ap_pod_t *pod, int num)
-      * readers stranded (a number of them could be tied up for
-      * a while serving time-consuming requests)
-      */
-+    /* Recall: we only worry about IDLE child processes here */
-     for (i = 0; i < num && rv == APR_SUCCESS; i++) {
-+        if (ap_scoreboard_image->servers[i][0].status != SERVER_READY ||
-+            ap_scoreboard_image->servers[i][0].pid == 0) {
-+            continue;
-+        }
-         rv = dummy_connection(pod);
-     }
- }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/c740e9705fd81b9676f0c414b5d9183ff35531de