From: Stefan Eissing <icing@apache.org>
Date: Tue, 6 Aug 2019 08:20:30 +0000 (+0000)
Subject: vote and promote
X-Git-Tag: 2.4.41~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18ef0ea22a6dac9e89ed0a53a6f3fe76a3c734bc;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote

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

diff --git a/STATUS b/STATUS
index e2602802986..b30470a0728 100644
--- a/STATUS
+++ b/STATUS
@@ -128,6 +128,28 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).
+     The above line could be used as CHANGES item.
+     The GCC flag "-Wno-error=comment" introduced by r1855446
+     and r1850745 (backported in r1856931) is only known since GCC 4.2.
+     Since it gets set unconditionally, this breaks compilation with old GCC
+     even when not using maintainer mode.
+     Make the fix for maintainer mode more specific by using
+     a version dependent pragma in the relevant two C files
+     only switching off error status for comment warnings.
+     The original maintainer mode problem seems to happen only
+     on certain platforms (observed on MacOS) or clang, because I could
+     not reproduce with GCC on Linux and Solaris. So not fixing the maintainer
+     mode problem for ancient GCC before 4.6 might be OK. more important is not
+     to break normal compilation on old platforms.
+     trunk patch: http://svn.apache.org/r1864435
+                  http://svn.apache.org/r1864438
+                  http://svn.apache.org/r1864450
+                  http://svn.apache.org/r1864451
+                  http://svn.apache.org/r1864464
+     2.4.x patch: svn merge -c 1864435,1864438,1864450,1864451,1864464 ^/httpd/httpd/trunk .
+     +1: jorton, rjung, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -166,28 +188,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1864428 ^/httpd/httpd/trunk .
      +1: icing, covener
 
-  *) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).
-     The above line could be used as CHANGES item.
-     The GCC flag "-Wno-error=comment" introduced by r1855446
-     and r1850745 (backported in r1856931) is only known since GCC 4.2.
-     Since it gets set unconditionally, this breaks compilation with old GCC
-     even when not using maintainer mode.
-     Make the fix for maintainer mode more specific by using
-     a version dependent pragma in the relevant two C files
-     only switching off error status for comment warnings.
-     The original maintainer mode problem seems to happen only
-     on certain platforms (observed on MacOS) or clang, because I could
-     not reproduce with GCC on Linux and Solaris. So not fixing the maintainer
-     mode problem for ancient GCC before 4.6 might be OK. more important is not
-     to break normal compilation on old platforms.
-     trunk patch: http://svn.apache.org/r1864435
-                  http://svn.apache.org/r1864438
-                  http://svn.apache.org/r1864450
-                  http://svn.apache.org/r1864451
-                  http://svn.apache.org/r1864464
-     2.4.x patch: svn merge -c 1864435,1864438,1864450,1864451,1864464 ^/httpd/httpd/trunk .
-     +1: jorton, rjung
-
      
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]