From: Jim Jagielski <jim@apache.org>
Date: Fri, 18 Dec 2009 14:08:15 +0000 (+0000)
Subject: bump up
X-Git-Tag: 2.2.15~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c4217d4345f0991c56797cefaabd66d97738198;p=thirdparty%2Fapache%2Fhttpd.git

bump up


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

diff --git a/STATUS b/STATUS
index d9d6a4594d5..73a7ebb787e 100644
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.2.x Patch: http://people.apache.org/~poirier/PR15866-22x.patch
     +1: poirier, rpluem, rjung, jim
 
+  * mod_filter: dispatch correctly where dispatch string doesn't exist
+    PR 48054
+    Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
+    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
+    +1: niq, rpluem, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -153,12 +158,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    +1: minfrin
 
 
-  * mod_filter: dispatch correctly where dispatch string doesn't exist
-    PR 48054
-    Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
-    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
-    +1: niq, rpluem, jim
-
    * mod_authnz_ldap: Add AuthLDAPBindAuthoritative to allow other authentication 
      providers a chance to run when mod_authnz_ldap finds a user but can't 
      verify their password. PR46608.