summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2015-06-17 09:53:16 +0000
committerYann Ylavic <ylavic@apache.org>2015-06-17 09:53:16 +0000
commit0835d3d3e770b1b72a8fd4b8e7494abd6ece42b4 (patch)
treef0b13d0c88c49df02e53c925fa421e18e3982a54
parent28b02712ce64ca385b7d8094efbd5f9053794802 (diff)
downloadhttpd-0835d3d3e770b1b72a8fd4b8e7494abd6ece42b4.tar.gz
Propose mod_substitute merge order fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685978 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS5
1 files changed, 5 insertions, 0 deletions
diff --git a/STATUS b/STATUS
index 942a1e7088..fd05372552 100644
--- a/STATUS
+++ b/STATUS
@@ -139,6 +139,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
+ *) mod_substitute: Fix configuraton merge order. PR 57641
+ trunk patch: http://svn.apache.org/r1684900
+ 2.4.x patch: trunk works (modulo CHANGES)
+ +1: ylavic
+
PATCHES/ISSUES THAT ARE STALLED