[apache2] 01/02: mpm_prefork: Fix segfault if started with -X

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 0fef7c9f2b5c800556943af8d51134bc88916ece
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Nov 23 19:22:15 2015 +0100

    mpm_prefork: Fix segfault if started with -X
    
    Seems like worker/event are not affected. See also
    https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?r1=1712521&r2=1712520&pathrev=1712521
---
 debian/changelog                                  |  6 ++++++
 debian/patches/prefork_single_process_crash.patch | 15 +++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aa0966c..78bb343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2 (2.4.17-3) UNRELEASED; urgency=medium
+
+  * mpm_prefork: Fix segfault if started with -X. Closes: #805737
+
+ -- Stefan Fritsch <sf at debian.org>  Mon, 23 Nov 2015 19:21:28 +0100
+
 apache2 (2.4.17-2) unstable; urgency=medium
 
   * Revert REDIRECT_URL to pre-2.4.17 behavior for now. The change broke
diff --git a/debian/patches/prefork_single_process_crash.patch b/debian/patches/prefork_single_process_crash.patch
new file mode 100644
index 0000000..c644a8b
--- /dev/null
+++ b/debian/patches/prefork_single_process_crash.patch
@@ -0,0 +1,15 @@
+# prefork part of
+# https://svn.apache.org/r1711479
+# https://svn.apache.org/r1711919 
+--- apache2.orig/server/mpm/prefork/prefork.c
++++ apache2/server/mpm/prefork/prefork.c
+@@ -1316,8 +1316,7 @@ static int prefork_open_logs(apr_pool_t
+     all_buckets = apr_pcalloc(pconf, num_buckets *
+                                      sizeof(prefork_child_bucket));
+     for (i = 0; i < num_buckets; i++) {
+-        if (!one_process && /* no POD in one_process mode */
+-                (rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
++        if ((rv = ap_mpm_pod_open(pconf, &all_buckets[i].pod))) {
+             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
+                          (startup ? NULL : s),
+                          "could not open pipe-of-death");
diff --git a/debian/patches/series b/debian/patches/series
index 59ac3a5..6412656 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ reproducible_builds.diff
 #suexec-custom.patch
 revert-REDIRECT_URL.patch
 mod_http2_log_protocol.patch
+prefork_single_process_crash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git