From: Nick Kew <niq@apache.org>
Date: Wed, 21 Jul 2010 08:44:55 +0000 (+0000)
Subject: Unite divided backport proposal.
X-Git-Tag: 2.2.16~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a96c00e8af7d36b431b53623dff48d1c540ef13e;p=thirdparty%2Fapache%2Fhttpd.git

Unite divided backport proposal.


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

diff --git a/STATUS b/STATUS
index fce17ca2ef6..26bb3da2d32 100644
--- a/STATUS
+++ b/STATUS
@@ -174,7 +174,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_headers: support global replace in Header Edit
      PR 46594 (not 47066 as incorrectly recorded in change log)
      trunk: http://svn.eu.apache.org/viewvc?view=revision&revision=894036
+            http://svn.apache.org/viewvc?view=revision&revision=966059
      2.2.x: http://people.apache.org/~niq/patches/46594.patch
+                              (newly updated to fold in r966059)
      +1: niq
 
   * core: Filter init functions are now run strictly once per request
@@ -242,10 +244,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2 patch: should apply cleanly
      +1: gstein
 
-   * mod_headers: fix omission in edit-multiple patch, noted by rpluem
-     Patch: http://svn.apache.org/viewvc?view=revision&revision=966059
-     +1: niq
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of