From: Stefan Eissing <icing@apache.org>
Date: Fri, 3 Jun 2022 14:37:23 +0000 (+0000)
Subject: Compile CHANGES.
X-Git-Tag: 2.4.54-rc1-candidate~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc50e8bbd2384f6ff153a2bf95e91622a0f700e;p=thirdparty%2Fapache%2Fhttpd.git

Compile CHANGES.
[skip ci]


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

diff --git a/CHANGES b/CHANGES
index 1995b7843c0..fcd3cd03d5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.54
 
+  *) mod_ssl: SSLFIPS compatible with OpenSSL 3.0.  PR 66063.
+     [Petr Sumbera <petr.sumbera oracle.com>, Yann Ylavic]
+
+  *) mod_proxy_http: Avoid 417 responses for non forwardable 100-continue.
+     PR 65666.  [Yann Ylavic]
+
   *) mod_md:  a bug was fixed that caused very large MDomains
      with the combined DNS names exceeding ~7k to fail, as
      request bodies would contain partially wrong data from
diff --git a/changes-entries/proxy_no_417.txt b/changes-entries/proxy_no_417.txt
deleted file mode 100644
index 3bf8893bfd4..00000000000
--- a/changes-entries/proxy_no_417.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy_http: Avoid 417 responses for non forwardable 100-continue.
-     PR 65666.  [Yann Ylavic]
\ No newline at end of file
diff --git a/changes-entries/ssl_fips_30.txt b/changes-entries/ssl_fips_30.txt
deleted file mode 100644
index b5f35ec0d2d..00000000000
--- a/changes-entries/ssl_fips_30.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_ssl: SSLFIPS compatible with OpenSSL 3.0.  PR 66063.
-     [Petr Sumbera <petr.sumbera oracle.com>, Yann Ylavic]
\ No newline at end of file