From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 20 Feb 2010 15:33:31 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.15~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b933320f09aa2c503254b0ce92a41980a139217;p=thirdparty%2Fapache%2Fhttpd.git

* Promote

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

diff --git a/STATUS b/STATUS
index 73be22242eb..022ac8a760e 100644
--- a/STATUS
+++ b/STATUS
@@ -102,6 +102,29 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   create a v2.2. patch?
     covener: resolved conflict 
 
+  * mod_include: Allow fine control over the removal of Last-Modified and ETag headers
+    within the INCLUDES filter, making it possible to cache responses if
+    desired. Fix the default value of the SSIAccessEnable directive.
+    2.2.x patch: http://people.apache.org/~minfrin/mod_include_caching2-2.2.patch
+    Trunk patch: http://svn.apache.org/viewvc?rev=905406&view=rev
+    +1: minfrin, jim, rpluem
+
+  * mod_log_config: Add the R option to log the handler used within the
+    request.
+    Submitted by: Christian Folini <christian.folini netnea com>
+    Trunk patch: http://svn.apache.org/viewvc?rev=905420&view=rev
+    Trunk works for 2.2.x
+    +1: minfrin, jim, rpluem
+
+  * mod_proxy_http: Make sure that when an ErrorDocument is served
+    from a reverse proxied URL, that the subrequest respects the status
+    of the original request. This brings the behaviour of proxy_handler
+    in line with default_handler.
+    PR: https://issues.apache.org/bugzilla/show_bug.cgi?id=47106
+    Trunk patch: http://svn.apache.org/viewvc?rev=909899&view=rev
+    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24976
+    +1: minfrin, jim, rpluem
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -161,35 +184,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
               identified in the comments.  Legitimate API users are
               presently broken by this memory scope flaw.]
 
-  * mod_include: Allow fine control over the removal of Last-Modified and ETag headers
-    within the INCLUDES filter, making it possible to cache responses if
-    desired. Fix the default value of the SSIAccessEnable directive.
-    2.2.x patch: http://people.apache.org/~minfrin/mod_include_caching2-2.2.patch
-    Trunk patch: http://svn.apache.org/viewvc?rev=905406&view=rev
-    +1: minfrin, jim, rpluem
-
-  * mod_log_config: Add the R option to log the handler used within the
-    request.
-    Submitted by: Christian Folini <christian.folini netnea com>
-    Trunk patch: http://svn.apache.org/viewvc?rev=905420&view=rev
-    Trunk works for 2.2.x
-    +1: minfrin, jim, rpluem
-
   * core: Support wildcards in both the directory and file components of
     the path specified by the Include directive.
     Trunk patch: http://svn.apache.org/viewvc?rev=909878&view=rev
     2.2.x patch: http://people.apache.org/~minfrin/httpd-wildcard+docs.patch
     +1: minfrin
 
-  * mod_proxy_http: Make sure that when an ErrorDocument is served
-    from a reverse proxied URL, that the subrequest respects the status
-    of the original request. This brings the behaviour of proxy_handler
-    in line with default_handler.
-    PR: https://issues.apache.org/bugzilla/show_bug.cgi?id=47106
-    Trunk patch: http://svn.apache.org/viewvc?rev=909899&view=rev
-    2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24976
-    +1: minfrin, jim, rpluem
-
   * support/htcacheclean: Teach it how to write a pid file (modelled on
     httpd's writing of a pid file) so that it becomes possible to run
     more than one instance of htcacheclean on the same machine.