From: Stefan Eissing <icing@apache.org>
Date: Tue, 10 Aug 2021 09:00:15 +0000 (+0000)
Subject: update after merges. [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58f76e82381103db4ec249e3e5881c0fa63f04ba;p=thirdparty%2Fapache%2Fhttpd.git

update after merges. [skip ci]


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

diff --git a/STATUS b/STATUS
index 94dbbc9a4d5..33da66b5ed0 100644
--- a/STATUS
+++ b/STATUS
@@ -266,18 +266,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              + make update-changes
      +1: ylavic,
 
-  *) core: fix ap_escape_quotes for pre-escaped quotes
-     trunk patch: https://svn.apache.org/r1892012
-     2.4.x patch: svn merge -c 1892012 ^/httpd/httpd/trunk .
-     +1: covener, jim, icing
-
-  *) core: avoid signed integer overflow under fuzzing in
-     ap_timeout_parameter_parse
-     trunk patch: https://svn.apache.org/r1892038
-     trunk patch: https://svn.apache.org/r1892063
-     2.4.x patch: svn merge -c 1892038,1892063 ^/httpd/httpd/trunk .
-     +1: covener, jim, icing
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]