From: Christophe Jaillet <jailletc36@apache.org>
Date: Tue, 24 Feb 2015 06:30:03 +0000 (+0000)
Subject: Merge r1652930, r1652933 from trunk
X-Git-Tag: 2.4.13~404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1836a0373457150f56a46b265c3da86f2f73b50d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1652930, r1652933 from trunk

   * acinclude.m4: Generate #LoadModule directive in default httpd.conf for
                   every --enable-mpms-shared. PR 53882.

Submitted by: olli hauer <ohauer gmx.de>, Yann Ylavic
Reviewed by: ylavic, rjung, jailletc36
Backported by: jailletc36

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

diff --git a/CHANGES b/CHANGES
index 690032901c3..ef32d263841 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.13
 
+  *) acinclude.m4: Generate #LoadModule directive in default httpd.conf for
+     every --enable-mpms-shared. PR 53882.  [olli hauer <ohauer gmx.de>,
+     Yann Ylavic]
+
   *) mod_authn_dbd: Fix the error message logged in case of error while querying
      the database. This is associated to AH01656 and AH01661. [Christophe Jaillet]
 
diff --git a/STATUS b/STATUS
index bbac82e0319..0799733c876 100644
--- a/STATUS
+++ b/STATUS
@@ -112,13 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (module CHANGES)
      +1: ylavic, wrowe, minfrin
 
-   * acinclude.m4: Generate #LoadModule directive in default httpd.conf for
-                   every --enable-mpms-shared. PR 53882.
-     trunk patch: http://svn.apache.org/r1652930
-                  http://svn.apache.org/r1652933 (CHANGES)
-     2.4.x patch: trunks works (modulo CHANGES)
-     +1: ylavic, rjung, jailletc36
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/acinclude.m4 b/acinclude.m4
index 580eb4abd87..6fa6382613e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -267,9 +267,9 @@ DISTCLEAN_TARGETS = modules.mk
 static =
 shared = $libname
 EOF
+            DSO_MODULES="$DSO_MODULES mpm_$1"
             # add default MPM to LoadModule list
             if test $1 = $default_mpm; then
-                DSO_MODULES="$DSO_MODULES mpm_$1"
                 ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1"
             fi
         fi