From: Joe Orton <jorton@apache.org>
Date: Mon, 1 Jul 2019 16:00:58 +0000 (+0000)
Subject: Couple more small fixes.
X-Git-Tag: 2.4.40~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5fe4c18429de838183259985a7c40b4f3a32239;p=thirdparty%2Fapache%2Fhttpd.git

Couple more small fixes.

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

diff --git a/STATUS b/STATUS
index f06337098dc..4e5a60cf6f4 100644
--- a/STATUS
+++ b/STATUS
@@ -214,9 +214,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      and update match for WAV files to work properly.
      trunk: http://svn.apache.org/r1491700
             http://svn.apache.org/r1862200
-     2.4.x: trunk works [needs CHANGES]
+     2.4.x: svn merge -c 1491700,1862200 ^/httpd/httpd/trunk . works [needs CHANGES]
      +1: jorton, jim
 
+  *) mod_socache_shmcb: fix gcc 9 warnings
+     trunk: http://svn.apache.org/r1858565
+     2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk .
+     +1: jorton,
+
+  *) Kill export of "nul" symbol.
+     trunk: http://svn.apache.org/r1861690
+     2.4.x: svn merge -c 1861690 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
 https://svn.apache.org/viewvc?view=revision&revision=1491700