From: Graham Leggett <minfrin@apache.org>
Date: Wed, 1 Jan 2020 22:17:37 +0000 (+0000)
Subject: Vote and promote.
X-Git-Tag: 2.4.42~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cfdce07abeda0d53ead4c83af6f524b20386773;p=thirdparty%2Fapache%2Fhttpd.git

Vote and promote.


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

diff --git a/STATUS b/STATUS
index a51004445e3..6e369c589f9 100644
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469
+      trunk patch: http://svn.apache.org/r1867183
+      2.4.x patch: svn merge -c 1867183 ^/httpd/httpd/trunk .
+      +1: jim, ylavic (by inspection), minfrin
+      jailletc36: -0
+                  I don't think that the #pragma black magic is of any help with GCC
+                  and jim seems to still have problem with clang and comments with //.
+                  See discussion at:
+                  https://lists.apache.org/thread.html/628cc54a1a345cb773d8e1be0639f8e75d2b481cf89232051c83b787@%3Cdev.httpd.apache.org%3E
+             jim: The problem still exists because this is NOT back ported yet. With this back port, the problem goes away.
+
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -175,17 +187,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   to changelog
       minfrin: r1836547 is indeed missing.
 
-   *) mod_proxy_html, mod_xml2enc: Fix build issues with macOS due to r1864469
-      trunk patch: http://svn.apache.org/r1867183
-      2.4.x patch: svn merge -c 1867183 ^/httpd/httpd/trunk .
-      +1: jim, ylavic (by inspection),
-      jailletc36: -0
-                  I don't think that the #pragma black magic is of any help with GCC 
-                  and jim seems to still have problem with clang and comments with //.
-                  See discussion at:
-                  https://lists.apache.org/thread.html/628cc54a1a345cb773d8e1be0639f8e75d2b481cf89232051c83b787@%3Cdev.httpd.apache.org%3E
-             jim: The problem still exists because this is NOT back ported yet. With this back port, the problem goes away.
-
   *) Easy patches: synch 2.4.x and trunk
         - core: Fix a comment
         - mod_auth_form: use the provided types via the macro