From: Eric Covener <covener@apache.org>
Date: Sat, 7 Aug 2021 10:43:50 +0000 (+0000)
Subject: add a revision from review [skip ci]
X-Git-Tag: candidate-2.4.49~3^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c81aba3aa5e2952f5cdcbbb6617fae1d383bcfb;p=thirdparty%2Fapache%2Fhttpd.git

add a revision from review [skip ci]


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

diff --git a/STATUS b/STATUS
index 55032413c5f..2ad8fa923d1 100644
--- a/STATUS
+++ b/STATUS
@@ -333,7 +333,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) core: avoid signed integer overflow under fuzzing in
      ap_timeout_parameter_parse
      trunk patch: https://svn.apache.org/r1892038
-     2.4.x patch: svn merge -c 1892038 ^/httpd/httpd/trunk .
+     trunk patch: https://svn.apache.org/r1892063
+     2.4.x patch: svn merge -c 1892038,1892063 ^/httpd/httpd/trunk .
      +1: covener, jim
 
 PATCHES/ISSUES THAT ARE BEING WORKED