From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 17 Jan 2019 11:18:15 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.4.38~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f643bd9b860176acdbd433e23d16b13d95acef6;p=thirdparty%2Fapache%2Fhttpd.git

Promote.

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

diff --git a/STATUS b/STATUS
index 8e7e323eaf9..52371c41376 100644
--- a/STATUS
+++ b/STATUS
@@ -125,6 +125,11 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy_wstunnel: Fix websocket proxy over UDS. PR 62932
+     trunk patch: http://svn.apache.org/r1851093
+     2.4.x patch: svn merge -c 1851093 ^/httpd/httpd/trunk .
+     +1: jailletc36 (by inspection), jim, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -197,11 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 of mod_proxy_html config? Otherwise modify mod_proxy_html's 
                 CPPFLAGS alone, without modifying global compilation flags.]
 
-  *) mod_proxy_wstunnel: Fix websocket proxy over UDS. PR 62932
-     trunk patch: http://svn.apache.org/r1851093
-     2.4.x patch: svn merge -c 1851093 ^/httpd/httpd/trunk .
-     +1: jailletc36 (by inspection), jim, ylavic
-
   *) easy proposals:
        - mod_authn_dbm: Return APR_SUCCESS which is equivalent but more readable
          than 'rv' here