From: Stefan Eissing <icing@apache.org>
Date: Mon, 13 Dec 2021 15:13:00 +0000 (+0000)
Subject: vote and promote. [skip ci]
X-Git-Tag: candidate-2.4.52-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427cb9ddc9de03eb3446d1a6c10a4f75553505a7;p=thirdparty%2Fapache%2Fhttpd.git

vote and promote. [skip ci]


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

diff --git a/STATUS b/STATUS
index 0e00b1e09fb..9790f9358ee 100644
--- a/STATUS
+++ b/STATUS
@@ -145,6 +145,12 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_http: Correctly sent a 100 Continue status code when sending an interim
+     response as result of an Expect: 100-Continue in the request and not the
+     current status code of the request. PR 65725
+     trunk patch: http://svn.apache.org/r1895719
+     2.4.x patch: svn merge -c 1895719 ^/httpd/httpd/trunk .
+     +1: ylavic, rpluem, icing
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -175,13 +181,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      backported together with it. The other three revisions look fine.
      minfrin: Tried r1586542 but got conflicts. Other revs were fine.
 
-  *) mod_http: Correctly sent a 100 Continue status code when sending an interim
-     response as result of an Expect: 100-Continue in the request and not the
-     current status code of the request. PR 65725
-     trunk patch: http://svn.apache.org/r1895719
-     2.4.x patch: svn merge -c 1895719 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem
-
   *) mod_proxy_connect, mod_proxy: Do not change the status code after we
      already sent it to the client.
      Trunk version of patch: