You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2015/02/24 07:30:03 UTC

svn commit: r1661848 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS acinclude.m4

Author: jailletc36
Date: Tue Feb 24 06:30:03 2015
New Revision: 1661848

URL: http://svn.apache.org/r1661848
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/acinclude.m4

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1661848&r1=1661847&r2=1661848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Feb 24 06:30:03 2015
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1661848&r1=1661847&r2=1661848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb 24 06:30:03 2015
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/acinclude.m4?rev=1661848&r1=1661847&r2=1661848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x/acinclude.m4 Tue Feb 24 06:30:03 2015
@@ -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