From: Rainer Jung <rjung@apache.org>
Date: Fri, 11 Jun 2010 08:39:38 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.2.16~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41008d2d7d115e5b7ec39ee949defa112e10249d;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index 8c40951dddc..463350fe686 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    +1: niq, pgollucci
    +1: rbowen - After much debate on IRC, we've agreed on FallbackResource as being the right name for this.
 
+ * mod_proxy_http, mod_proxy_ajp, mod_reqtimeout: Use APR_STATUS_IS_TIMEUP
+   instead of direct compare to APR_TIMEUP to be more safe on different platforms.
+   Backport from trunk of http://svn.apache.org/viewvc?rev=953418&view=rev
+                          http://svn.apache.org/viewvc?rev=953385&view=rev
+                          http://svn.apache.org/viewvc?rev=953377&view=rev
+   +1: rjung, wrowe, rpluem
+   -1: 
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -219,14 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x Patch: http://people.apache.org/~minfrin/httpd-cache-partial2-2.2.patch
      +1: minfrin
 
-  *) mod_proxy_http, mod_proxy_ajp, mod_reqtimeout: Use APR_STATUS_IS_TIMEUP
-     instead of direct compare to APR_TIMEUP to be more safe on different platforms.
-     Backport from trunk of http://svn.apache.org/viewvc?rev=953418&view=rev
-                            http://svn.apache.org/viewvc?rev=953385&view=rev
-                            http://svn.apache.org/viewvc?rev=953377&view=rev
-     +1: rjung, wrowe, rpluem
-     -1: 
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of