From: Christophe Jaillet <jailletc36@apache.org>
Date: Tue, 22 May 2018 18:57:09 +0000 (+0000)
Subject: Update proposal
X-Git-Tag: 2.4.34~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4b18d97cb5b24105c0aa62ca82cfe4e8101fb12;p=apache

Update proposal

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

diff --git a/STATUS b/STATUS
index 0999114d55..eadf152d37 100644
--- a/STATUS
+++ b/STATUS
@@ -319,10 +319,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   (trunk works modulo CHANGES))
      +1: ylavic,
 
-  *) mod_http2: silence gcc strncpy warnings which break compilation in
-     maintainer mode with gcc 8.1.0
+  *) mod_ssl: fix a potential NULL dereference spotted by gcc 8.1.0
+     mod_http2: silence gcc strncpy warnings which break compilation in
+                maintainer mode with gcc 8.1.0
      trunk patch: http://svn.apache.org/r1831231
-     2.4.x patch: svn merge -c 1831231 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1831591
+     2.4.x patch: svn merge -c 1831231,1831591 ^/httpd/httpd/trunk .
      +1: jailletc36,