]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
And bump up patch with 3 +1s
authorJim Jagielski <jim@apache.org>
Wed, 31 May 2006 02:27:27 +0000 (02:27 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 31 May 2006 02:27:27 +0000 (02:27 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@410420 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index d9c558f8d780b6424ac52ec3fa48d5818242bc99..ce364fb6f8ecb4f04b27acec6783cc58b81f8ec7 100644 (file)
--- 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).