From: Stefan Eissing <icing@apache.org>
Date: Fri, 26 Nov 2021 09:34:31 +0000 (+0000)
Subject: update backport h2 proposal by adding r1895349. [skip ci]
X-Git-Tag: candidate-2.4.52-rc1~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e5979b0ddaf0be1fc6761d2db276c7552e25209;p=thirdparty%2Fapache%2Fhttpd.git

update backport h2 proposal by adding r1895349. [skip ci]


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

diff --git a/STATUS b/STATUS
index 073c1526011..08908003545 100644
--- a/STATUS
+++ b/STATUS
@@ -202,6 +202,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        When unprocessed h2 requests were queued at the time, these could stall.
        See <https://github.com/icing/mod_h2/issues/212>.
      - fix logic for non-proxy Server and Date response headers. [ylavic]
+     - The pollset implemenation is only enabled when APR >= 1.6 is detected.
      Trunk version of patch:
         https://svn.apache.org/r1894163
         https://svn.apache.org/r1894169
@@ -219,6 +220,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/r1894728
         https://svn.apache.org/r1894949
         https://svn.apache.org/r1895336
+        https://svn.apache.org/r1895349
      Backport version for 2.4.x of patch:
        PR: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/275.diff
      +1: icing,