From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 20 Feb 2019 13:21:39 +0000 (+0000)
Subject: Update proposal (and comment about it).
X-Git-Tag: 2.4.39~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce8a0d670455cf15147695adac9230006a9899a1;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal (and comment about it).

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

diff --git a/STATUS b/STATUS
index 8c726d49d63..3ee1c983065 100644
--- a/STATUS
+++ b/STATUS
@@ -243,8 +243,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1853518
                   http://svn.apache.org/r1853561
                   http://svn.apache.org/r1853566
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v3.patch
-     +1: ylavic, icing
+                  http://svn.apache.org/r1853953
+                  http://svn.apache.org/r1853956
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v4.patch
+     +1: ylavic
+     ylavic: please note the "s/ASCII_(CRLF|ZERO)/\1_ASCII/g" in the backport,
+             same as in trunk (where definitions come from httpd.h) so doing
+             the change now in 2.4.x helps backports. Since in 2.4.x these
+             macros are still locally #defined, I also added the #ifdefs around
+             them to avoid potential issues..
+             @icing: sorry I had to reset your vote for v4, but it looks
+             sensible to me to have trunk and 2.4.x code in sync as much as
+             possible. Changes from v3 to v4 (r1853953 mainly, r1853956 is only
+             comment) are non functional (or at least intended as such).
+             
 
   *) mod_reqtimeout: Allow to configure (TLS-)handshake timeouts.  PR 61310.
      trunk patch: http://svn.apache.org/r1853901