]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update after merge. [skip ci]
authorStefan Eissing <icing@apache.org>
Mon, 16 Aug 2021 14:30:57 +0000 (14:30 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 16 Aug 2021 14:30:57 +0000 (14:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892381 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 2aed492b600d5761cb2e3d22c4aad0b0dbee4099..ff6ea1d92b53f1e9f0e0dae4512cae1dab440750 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -266,12 +266,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              + make update-changes
      +1: ylavic,
 
- *) core: ap_timeout_parameter_parse UBI fuzz fix followup
-    trunk patch: http://svn.apache.org/r1892185
-    trunk patch: http://svn.apache.org/r1892207
-    svn merge -c 1892185,1892207 ^/httpd/httpd/trunk .
-    +1: covener, icing, jorton, jim
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]