]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Remove the backport.
authorGraham Leggett <minfrin@apache.org>
Wed, 1 Jan 2020 22:51:59 +0000 (22:51 +0000)
committerGraham Leggett <minfrin@apache.org>
Wed, 1 Jan 2020 22:51:59 +0000 (22:51 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1872224 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 6e369c589f91aa887b9eed084c3d268dc10f0b01..e2a210ad90348babd3448f4f6f2976f9fc39f4aa 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -132,17 +132,6 @@ 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: