From: Stefan Eissing <icing@apache.org>
Date: Thu, 23 Sep 2021 09:13:59 +0000 (+0000)
Subject: Reload of proposed mod_http2 backport of server graceful handling,
X-Git-Tag: candidate-2.4.50-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72ef9bf98ca1d37fbff567defea6d02b9dc0e8cd;p=thirdparty%2Fapache%2Fhttpd.git

Reload of proposed mod_http2 backport of server graceful handling,
including all the tiny code changes that were never proposed.



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

diff --git a/STATUS b/STATUS
index 400f90c9892..3dafcc2e818 100644
--- a/STATUS
+++ b/STATUS
@@ -166,12 +166,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_http2: when a server is restarted gracefully, any idle h2 worker
      threads are shut down immediately.
      Also, change OpenSSL API use for deprecations in OpenSLL 3.0.
+     Adds all other, never proposed code changes to make a clean
+     sync of http2 sources.
      trunk patch: http://svn.apache.org/r1893214
                   http://svn.apache.org/r1893215
                   http://svn.apache.org/r1893220
-     2.4.x patch: svn merge -c 1893214,1893215,1893220 ^/httpd/httpd/trunk .
+                  and other never proposed code changes
+     PR: https://github.com/apache/httpd/pull/270
      +1: icing,
-     rpluem says: This one has merge conflicts.
 
    *) mod_rewrite: Fix UDS ("unix:") scheme for [P] rules.  PR 57691 + 65590.
       Trunk version of patch: