From: Jim Jagielski <jim@apache.org>
Date: Wed, 31 May 2006 02:27:27 +0000 (+0000)
Subject: And bump up patch with 3 +1s
X-Git-Tag: 2.2.3~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55b04b78dd062f230c17324f33dda112618c4a0d;p=thirdparty%2Fapache%2Fhttpd.git

And bump up patch with 3 +1s


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

diff --git a/STATUS b/STATUS
index d9c558f8d78..ce364fb6f8e 100644
--- a/STATUS
+++ b/STATUS
@@ -95,6 +95,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       2.2.x (identical)
       +1: niq, trawick, rpluem
 
+    * mod_mem_cache: Add Content-Type to headers_out if not already set.
+      PR 39266.
+        Trunk version of patch:
+          http://svn.apache.org/viewcvs?rev=399388&view=rev
+        2.2.x version of patch:
+          Trunk version works
+      +1 rpluem, trawick, jim
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * Add optional 'scheme://' part to ServerName directive for cases
@@ -118,14 +126,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewcvs.cgi?rev=396310&view=rev
       +1 niq, rpluem
 
-    * mod_mem_cache: Add Content-Type to headers_out if not already set.
-      PR 39266.
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=399388&view=rev
-        2.2.x version of patch:
-          Trunk version works
-      +1 rpluem, trawick, jim
-
     * configure: Add "--with-included-apr" flag to force use of
     bundled version of APR/APR-util rather than any installed
     versions found on the system (as preferred by find_ap?.m4).