From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 27 May 2019 20:17:24 +0000 (+0000)
Subject: Update 100-continue patch after r1859845.
X-Git-Tag: 2.4.40~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c35425a0fa39857ea0b08dd79769d7be43dfde;p=thirdparty%2Fapache%2Fhttpd.git

Update 100-continue patch after r1859845.

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

diff --git a/STATUS b/STATUS
index d2eb79c35ae..a0b68f7cff9 100644
--- a/STATUS
+++ b/STATUS
@@ -208,9 +208,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              comment) are non functional (or at least intended as such).
      +1: ylavic, icing, jim
      ylavic: plus http://svn.apache.org/r1856036 (opt-out)
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v5.patch
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v6.patch
      +1: ylavic, jim
      minfrin: the above v5 patch fails to apply for me, if you update it I'll take a look.
+     ylavic: v6 applies to latest 2.4.x (i.e. changes/conflicts from r1859845), thanks!
 
   *) core: make the eor bucket do the right thing when copied
      trunk patch: http://svn.apache.org/r1707084