From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 16 Dec 2016 15:41:24 +0000 (+0000)
Subject: Vote, promote.
X-Git-Tag: 2.4.25~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a71a17eea6dc6afa8190b2ace3fe9b9f17ad6e6;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote.

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

diff --git a/STATUS b/STATUS
index c6e63dc16cf..d044b90ef34 100644
--- a/STATUS
+++ b/STATUS
@@ -118,6 +118,21 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_socache_memcache: Use correct format pattern, "%lu" is wrong for
+     apr_uint64_t on some platforms.
+     Followup to r1649491 (trunk) resp. r1774016 (2.4.x).
+     trunk patch: http://svn.apache.org/r1774602
+     2.4.x patch: trunk works
+     +1: rjung, jim, ylavic
+
+  *) APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
+     defined, to either 0 or 1).
+     This fixes a compile error on Windows introduced by r1702948.
+     as well as straightens up two long-time glitches.
+     trunk patch: http://svn.apache.org/r1706595
+     2.4.x patch: trunk works
+     +1: rjung, jim, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -140,13 +155,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: ylavic, jim
 
-  *) mod_socache_memcache: Use correct format pattern, "%lu" is wrong for
-     apr_uint64_t on some platforms.
-     Followup to r1649491 (trunk) resp. r1774016 (2.4.x).
-     trunk patch: http://svn.apache.org/r1774602
-     2.4.x patch: trunk works
-     +1: rjung, jim
-
   *) mod_socache_memcache: Add ../generators to include path for Windows
      build. It now needs mod_status.h.
      Untested but exactly analogous to what works for
@@ -155,14 +163,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: rjung, jim
 
-  *) APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
-     defined, to either 0 or 1).
-     This fixes a compile error on Windows introduced by r1702948.
-     as well as straightens up two long-time glitches.
-     trunk patch: http://svn.apache.org/r1706595
-     2.4.x patch: trunk works
-     +1: rjung, jim
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]