From: Luca Toscano <elukey@apache.org>
Date: Sat, 30 Sep 2017 11:26:48 +0000 (+0000)
Subject: Vote + promote
X-Git-Tag: 2.4.29~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c8e0e5820c6224c4909bce7a90845bb2895fbe;p=thirdparty%2Fapache%2Fhttpd.git

Vote + promote

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

diff --git a/STATUS b/STATUS
index bbd9c0d6c04..5227def2840 100644
--- a/STATUS
+++ b/STATUS
@@ -116,6 +116,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_authz_dbd: Fix a segmentation fault if AuthzDBDQuery is not set.
+     PR 61546
+     trunk patch: http://svn.apache.org/r1809209
+     2.4.x patch: svn merge -c 1809209 ^/httpd/httpd/trunk .
+     +1: jailletc36 (by inspection), ylavic, elukey
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -185,12 +190,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: svn merge -c 1798785 ^/httpd/httpd/trunk .
      +1: jailletc36, ylavic
 
-   *) mod_authz_dbd: Fix a segmentation fault if AuthzDBDQuery is not set.
-      PR 61546
-      trunk patch: http://svn.apache.org/r1809209
-      2.4.x patch: svn merge -c 1809209 ^/httpd/httpd/trunk .
-      +1: jailletc36 (by inspection), ylavic
-
    *) mod_http2: Fix race condition on request body handlign.
       2.4.x patch: svn merge -c 1804096,1807238,1809981,1810088,1810089 ^/httpd/httpd/trunk .
       +1: icing, steffenal