From: Jim Jagielski <jim@apache.org>
Date: Mon, 12 Jul 2010 18:45:52 +0000 (+0000)
Subject: update
X-Git-Tag: 2.2.16~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a97eb3ff053fa7d36651a180908818ffe64cbd0;p=thirdparty%2Fapache%2Fhttpd.git

update


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

diff --git a/STATUS b/STATUS
index 765b3a8f253..1537283c3cf 100644
--- a/STATUS
+++ b/STATUS
@@ -114,6 +114,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
            option in the docs page, like e.g. we did for SSLInsecureRenegotiation.
     wrowe asks; you mean <Compatibility> tag?  Yes, of course.
 
+  *) mod_filter: enable filtering of errordocuments.  PR 48377
+     http://svn.apache.org/viewvc?view=revision&revision=894041
+     +1: niq, rjung, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -206,10 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~rjung/patches/httpd-branch-2.2-mod_rewrite-env_var-emptyvalue.patch
      +1: rjung, niq
 
-  *) mod_filter: enable filtering of errordocuments.  PR 48377
-     http://svn.apache.org/viewvc?view=revision&revision=894041
-     +1: niq, rjung, jim
-
   *) 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