]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
add a revision from review [skip ci]
authorEric Covener <covener@apache.org>
Sat, 7 Aug 2021 10:43:50 +0000 (10:43 +0000)
committerEric Covener <covener@apache.org>
Sat, 7 Aug 2021 10:43:50 +0000 (10:43 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892064 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 55032413c5f5c116e524851fe8fde72bb8ea89e0..2ad8fa923d1572ea2db81f511540c40972dd554b 100644 (file)
--- 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