From: Luca Toscano <elukey@apache.org>
Date: Sat, 8 Oct 2016 10:22:13 +0000 (+0000)
Subject: Vote and promote
X-Git-Tag: 2.4.24~211
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b64a34a8c659c853bb7fd549e2bca9c2d4bbc22a;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote

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

diff --git a/STATUS b/STATUS
index 650ac006034..f04bd512d93 100644
--- a/STATUS
+++ b/STATUS
@@ -131,6 +131,10 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo aplog numbers)
      +1: jchampion, jim, ylavic
 
+  *) event: Don't assume sizeof.
+     trunk patch: http://svn.apache.org/r1732228
+     2.4.x patch: trunk works
+     +1: jim, ylavic, elukey
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -223,11 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 added to CFLAGS because when combined with -Wstrict-prototypes,
                 the AC_LANG_PROGRAM won't compile (it uses a bare main()).
 
-  *) event: Don't assume sizeof.
-     trunk patch: http://svn.apache.org/r1732228
-     2.4.x patch: trunk works
-     +1: jim, ylavic
-
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if