From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 12 Jan 2009 11:53:17 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.12~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d492ded9eb594946c667c307ec56ad49df19718;p=thirdparty%2Fapache%2Fhttpd.git

* Promote


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

diff --git a/STATUS b/STATUS
index a6ef890af87..b9b20c4e810 100644
--- a/STATUS
+++ b/STATUS
@@ -103,6 +103,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         trunk works
     +1 covener, rpluem, niq
 
+  * core: Translate locally generated "100-Continue" messages to ASCII
+    on EBCDIC systems, and translate the status_line on the way out of
+    ap_send_interim_response().
+      trunk:
+        http://svn.apache.org/viewvc?rev=732832&view=rev
+        http://svn.apache.org/viewvc?rev=733134&view=rev
+        http://svn.apache.org/viewvc?rev=733218&view=rev
+      2.2.x:
+        trunk works
+    +1 covener, niq, rpluem
+
+ * mod_proxy_http: Add server_rec to ap_log_error() calls for interim
+   response messages
+    trunk 
+      http://svn.apache.org/viewvc?rev=733127&view=rev
+      http://svn.apache.org/viewvc?rev=733219&view=rev
+    2.2.x:
+      trunk works
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -140,26 +159,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              the local URI.  This preserves rulesets that are carefully
              watching %{PATH_INFO} in their substitutions.  Not pretty
              by any means but I think necessary to require opt-in for 2.2.x.
- 
-  * core: Translate locally generated "100-Continue" messages to ASCII
-    on EBCDIC systems, and translate the status_line on the way out of
-    ap_send_interim_response().
-      trunk:
-        http://svn.apache.org/viewvc?rev=732832&view=rev
-        http://svn.apache.org/viewvc?rev=733134&view=rev
-        http://svn.apache.org/viewvc?rev=733218&view=rev
-      2.2.x:
-        trunk works
-    +1 covener, niq, rpluem
-
- * mod_proxy_http: Add server_rec to ap_log_error() calls for interim
-   response messages
-    trunk 
-      http://svn.apache.org/viewvc?rev=733127&view=rev
-      http://svn.apache.org/viewvc?rev=733219&view=rev
-    2.2.x:
-      trunk works
-    +1: covener, niq, rpluem
 
  * mod_ssl: Add SSLRenegBufferSize to configure the amount of memory that will
    be used for buffering the request body if a per-location SSL renegotiationi