From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 14 Dec 2021 15:24:32 +0000 (+0000)
Subject: Sync changes-entries [skip ci].
X-Git-Tag: 2.5.0-alpha2-ci-test-only~646
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14ffd8c7b397046cfa8e0195b07eb42dc41e644e;p=thirdparty%2Fapache%2Fhttpd.git

Sync changes-entries [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895953 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 32d6c017562..63ff1a9337b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,24 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+
+
+
+  *) http: Enforce that fully qualified uri-paths not to be forward-proxied
+     have an http(s) scheme, and that the ones to be forward proxied have a
+     hostname, per HTTP specifications.  [Ruediger Pluem, Yann Ylavic]
+
+  *) mod_http2: fixed a bug in v2.0.0 that could lead to an infinite
+     loop when clients close connections prematurely.
+     Enhanced the scoreboard status updates on h2 connections for
+     mod_status. 'server-status' now gives a better idea what the
+     connection is working on.
+     [Stefan Eissing]
+
+  *) 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 [Ruediger Pluem]
+
   *) mod_proxy_connect: Honor the smallest of the backend or client timeout
      while tunneling.  [Yann Ylavic]
 
diff --git a/changes-entries/http2_2.0.1.txt b/changes-entries/http2_2.0.1.txt
deleted file mode 100644
index 9ae23f20cff..00000000000
--- a/changes-entries/http2_2.0.1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-  *) mod_http2: fixed a bug in v2.0.0 that could lead to an infinite
-     loop when clients close connections prematurely.
-     Enhanced the scoreboard status updates on h2 connections for
-     mod_status. 'server-status' now gives a better idea what the
-     connection is working on.
-     [Stefan Eissing]
\ No newline at end of file
diff --git a/changes-entries/http_enforcements.txt b/changes-entries/http_enforcements.txt
deleted file mode 100644
index 3e16f109f2f..00000000000
--- a/changes-entries/http_enforcements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) http: Enforce that fully qualified uri-paths not to be forward-proxied
-     have an http(s) scheme, and that the ones to be forward proxied have a
-     hostname, per HTTP specifications.  [Yann Ylavic]
diff --git a/changes-entries/pr65725.txt b/changes-entries/pr65725.txt
deleted file mode 100644
index 3e8fee91e0d..00000000000
--- a/changes-entries/pr65725.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) 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 [Ruediger Pluem]