From: Christophe Jaillet <jailletc36@apache.org>
Date: Wed, 27 Sep 2017 05:49:08 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.29~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85f2e0de4930f53626d7199206806bf63d154587;p=apache

Propose

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

diff --git a/STATUS b/STATUS
index 1d1d92a892..f090e16a73 100644
--- a/STATUS
+++ b/STATUS
@@ -171,7 +171,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              and virtual host, though using ap_server_conf makes them global
              only (thus less useful too...).
 
-   * mod_journald: Add new module mod_journald to log error logs into journald.
+   *) mod_journald: Add new module mod_journald to log error logs into journald.
      trunk patch: http://svn.apache.org/r1610339
                   http://svn.apache.org/r1621806
      2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-mod_journald.patch
@@ -180,6 +180,11 @@ 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
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]