]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add another patch to fix the new use of pragma.
authorRainer Jung <rjung@apache.org>
Mon, 5 Aug 2019 14:33:12 +0000 (14:33 +0000)
committerRainer Jung <rjung@apache.org>
Mon, 5 Aug 2019 14:33:12 +0000 (14:33 +0000)
Still under test.

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

STATUS

diff --git a/STATUS b/STATUS
index d45ee5d789c56f3cd2b77859beb871376bbc3bae..1a76d951956520fb4b8c402813fcb4f4fb70c395 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -284,7 +284,8 @@ PATCHES/ISSUES THAT ARE BEING WORKED
      only switching off error status for comment warnings.
      Still need some work due to feedback in the PR.
      trunk patch: http://svn.apache.org/r1864435
-     2.4.x patch: svn merge -c 1864435 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1864438
+     2.4.x patch: svn merge -c 1864435,1864438 ^/httpd/httpd/trunk .
      +1: