]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Promote one more.
authorRainer Jung <rjung@apache.org>
Tue, 6 Oct 2015 12:11:19 +0000 (12:11 +0000)
committerRainer Jung <rjung@apache.org>
Tue, 6 Oct 2015 12:11:19 +0000 (12:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707024 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 128e16013d5383dc4826a9758f52c869da2e6c6d..83333fa6bbc3071bf5564a636d7ff1a45282de49 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-AC_DEFUN_quotes.patch
      +1: ylavic, jim, rjung
 
+   * mod_substitute: Configure patterns merge order. PR 57641
+     trunk patch: http://svn.apache.org/r1684900
+                  http://svn.apache.org/r1687539 
+                  http://svn.apache.org/r1687680
+                  http://svn.apache.org/r1688331
+                  http://svn.apache.org/r1688339
+                  http://svn.apache.org/r1688340
+                  http://svn.apache.org/r1688341
+                  http://svn.apache.org/r1688343
+                  http://svn.apache.org/r1697013
+                  http://svn.apache.org/r1697015
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v6.patch
+     +1: ylavic, wrowe, rjung
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -161,20 +175,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              does a minor bump only.
      minfrin: Two new directives need to be documented.
 
-  *) mod_substitute: Configure patterns merge order. PR 57641
-     trunk patch: http://svn.apache.org/r1684900
-                  http://svn.apache.org/r1687539 
-                  http://svn.apache.org/r1687680
-                  http://svn.apache.org/r1688331
-                  http://svn.apache.org/r1688339
-                  http://svn.apache.org/r1688340
-                  http://svn.apache.org/r1688341
-                  http://svn.apache.org/r1688343
-                  http://svn.apache.org/r1697013
-                  http://svn.apache.org/r1697015
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SubstituteInheritBefore-v6.patch
-     +1: ylavic, wrowe, rjung
-
   *) mod_proxy: don't recyle backend announced "Connection: close" connections
      to avoid reusing it should the close be effective after some new request
      is ready to be sent.