From: Jacob Champion <jchampion@apache.org>
Date: Wed, 12 Jul 2017 00:41:44 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.28~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37af366fceebd2bac32f26693f132726a5a20094;p=apache

Propose.

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

diff --git a/STATUS b/STATUS
index b8331a16a3..f30565e9db 100644
--- a/STATUS
+++ b/STATUS
@@ -216,6 +216,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_proxy_wstunnel fix PR 61142
      2.4.x patch: svn merge -c 1801594 ^/httpd/httpd/trunk .
      +1: jfclere
+
+  *) Makefile: Use different variables to track normal modules and MPMs during
+               build. Only the enabled MPM is uncommented in the configuration
+               if multiple DSOs are built, and LoadModule for MPMs will now come
+               before LoadModule for the normal modules. Patch by rjung.
+     trunk patch: https://svn.apache.org/r1729235
+                  https://svn.apache.org/r1730079
+                  https://svn.apache.org/r1801665
+     2.4.x patch: svn merge -c1729235 -c1730079 -c1801665 ^/httpd/httpd/trunk
+     +1: jchampion
      
 
 PATCHES/ISSUES THAT ARE BEING WORKED