]> granicus.if.org Git - apache/commitdiff
Update proposal
authorChristophe Jaillet <jailletc36@apache.org>
Tue, 22 May 2018 18:57:09 +0000 (18:57 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Tue, 22 May 2018 18:57:09 +0000 (18:57 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832056 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0999114d55ac313c20c677c611c810f39131c40e..eadf152d37e4b375be0c7a6a177fbc296075d878 100644 (file)
--- 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,