Commit 672ad4d6 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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
parent 1dc13b93

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

acinclude.m4

+1 −1
Changes for acinclude.m4: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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