From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 23 Aug 2010 15:07:03 +0000 (+0000)
Subject: * Promote
X-Git-Tag: 2.2.17~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a32b1e9fb79d8ff1015925c79ae272e25e0c81c;p=thirdparty%2Fapache%2Fhttpd.git

* Promote

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

diff --git a/STATUS b/STATUS
index e703ee2471b..5bf56ac3451 100644
--- a/STATUS
+++ b/STATUS
@@ -87,6 +87,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_log_config: Make ${cookie}C correctly match whole cookie names
+    instead of substrings.
+    PR: 28037
+    Trunk patch: http://svn.apache.org/viewvc?rev=833738&view=rev
+                 http://svn.apache.org/viewvc?rev=834006&view=rev
+                 http://svn.apache.org/viewvc?rev=834013&view=rev
+                 http://svn.apache.org/viewvc?rev=834500&view=rev
+    2.2.x patch: http://people.apache.org/~sf/log_cookie_28037.diff
+    +1: sf, jim, rpluem
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -101,16 +110,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    sf:        Couldn't the linux 2.4 bug be worked around by calling access
               twice? Once with R_OK and once with X_OK.
 
-  * mod_log_config: Make ${cookie}C correctly match whole cookie names
-    instead of substrings.
-    PR: 28037
-    Trunk patch: http://svn.apache.org/viewvc?rev=833738&view=rev
-                 http://svn.apache.org/viewvc?rev=834006&view=rev
-                 http://svn.apache.org/viewvc?rev=834013&view=rev
-                 http://svn.apache.org/viewvc?rev=834500&view=rev
-    2.2.x patch: http://people.apache.org/~sf/log_cookie_28037.diff
-    +1: sf, jim, rpluem
-
   * mod_req-timeout/core: Backport bugfixes from trunk up to r935339:
     - Do not wrongly enforce timeouts for mod_proxy's backend
       connections and other protocol handlers (like mod_ftp).