From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 30 Jun 2020 16:15:30 +0000 (+0000)
Subject: 2.4.x patch Eric's proposal, with latest changes [skip ci].
X-Git-Tag: 2.4.44~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd5aa0f542556466b76f9befa63ff2b60519d797;p=thirdparty%2Fapache%2Fhttpd.git

2.4.x patch Eric's proposal, with latest changes [skip ci].

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

diff --git a/STATUS b/STATUS
index 8043067e937..3674753fd26 100644
--- a/STATUS
+++ b/STATUS
@@ -242,12 +242,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  also here
 
  *) strict content-length parsing
-     trunk patch http://svn.apache.org/1877954
-                 http://svn.apache.org/1877955
-                 http://svn.apache.org/1879369
-     2.4.x patch: svn merge -c 1877954,1877955,1879369  ^/httpd/httpd/trunk .
-                  (manual log-message-tags and ap_mmn and apreq conflicts need to be sorted)
-    +1: 
+     trunk patch http://svn.apache.org/r1877954
+                 http://svn.apache.org/r1877955
+                 http://svn.apache.org/r1879369
+                 http://svn.apache.org/r1879373
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-ap_parse_strict_length.patch
+    +1: ylavic
+	ylavic: the patch drops changes to apreq, which seems to not be in 2.4.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED