From: Yann Ylavic <ylavic@apache.org>
Date: Sun, 16 May 2021 11:34:16 +0000 (+0000)
Subject: Add other missing commits. [skip ci]
X-Git-Tag: 2.4.48~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0021a1834cb52c8e3b9012fcaa90243c0e4ab7be;p=thirdparty%2Fapache%2Fhttpd.git

Add other missing commits. [skip ci]

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

diff --git a/STATUS b/STATUS
index e4d54432932..38d91523839 100644
--- a/STATUS
+++ b/STATUS
@@ -169,11 +169,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1734281
                   http://svn.apache.org/r1838055
                   http://svn.apache.org/r1838079
+                  http://svn.apache.org/r1840229
                   http://svn.apache.org/r1876664
                   http://svn.apache.org/r1876674
                   http://svn.apache.org/r1876784
                   http://svn.apache.org/r1879078
                   http://svn.apache.org/r1881620
+                  http://svn.apache.org/r1887311
                   http://svn.apache.org/r1888871
      2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/187.diff
                   (see https://github.com/apache/httpd/pull/187)