From: Jim Jagielski <jim@apache.org>
Date: Fri, 28 Aug 2009 14:35:26 +0000 (+0000)
Subject: And upgrade
X-Git-Tag: 2.2.14~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8184dc9d65fbe0ff8548fb4eb54499d3bb0686af;p=thirdparty%2Fapache%2Fhttpd.git

And upgrade


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

diff --git a/STATUS b/STATUS
index b0455e8f226..d22e17fad0b 100644
--- a/STATUS
+++ b/STATUS
@@ -101,16 +101,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    2.2.x Patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24124
    +1: poirier, minfrin, covener, jim
 
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
- * prefork MPM: simple patch to enable mod_privileges.
-   trunk: N/A (this patch substitutes for the availability of
-               drop_privileges hook).
-   2.2.x patch:
-      http://people.apache.org/~niq/patches/2.2mod_privileges-core-patch
-   +1: niq
-
  * mod_cache: Add CacheIgnoreURLSessionIdentifiers directive to ignore
               defined session identifiers encoded in the URL when caching.
    Trunk version of patch:
@@ -122,6 +112,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk version of patch works
    +1: rpluem, jim, minfrin
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+ * prefork MPM: simple patch to enable mod_privileges.
+   trunk: N/A (this patch substitutes for the availability of
+               drop_privileges hook).
+   2.2.x patch:
+      http://people.apache.org/~niq/patches/2.2mod_privileges-core-patch
+   +1: niq
+
  * unixd: set suexec_enabled correctly when httpd is run by non-root
    PR 42175
    Trunk Patch: http://cvs.apache.org/viewvc?view=rev&revision=791337