From: Joe Orton <jorton@apache.org>
Date: Tue, 10 Oct 2017 11:25:56 +0000 (+0000)
Subject: 1*merged.
X-Git-Tag: 2.4.29~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c423deb2d139da251b956852e5442d5ec2e388c;p=thirdparty%2Fapache%2Fhttpd.git

1*merged.


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

diff --git a/STATUS b/STATUS
index 3c825339817..10be6a4bd68 100644
--- a/STATUS
+++ b/STATUS
@@ -214,11 +214,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                 mod_journald can't be configured in maintainer mode (-std=c89).
                 Can anyone else reproduce, or is it just my distro?
 
-   *) Quiet spurious gcc warning in ap_parse_form_data
-      trunk patch: http://svn.apache.org/r1798785
-      2.4.x patch: svn merge -c 1798785 ^/httpd/httpd/trunk .
-     +1: jailletc36, ylavic, jorton
-
    *) mod_rewrite,core: Avoid the 'Vary: Host' response header when HTTP_HOST
                         is used in a condition that evaluates to true.
       trunk patch: http://svn.apache.org/r1808746
@@ -229,6 +224,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    *) mod_ssl: Fix SessionTicket callback return value, which does
       seem to matter with OpenSSL 1.1.
       trunk: https://svn.apache.org/r1736186
+      2.4.x patch: trunk works
       +1: jorton, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED