Sync CHANGES.

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

diff --git a/CHANGES b/CHANGES
index 5f1abd266076aff508228fc0a6b02136ecddf298..4a2a2011e0a51c5384f1b2e95b7b8cc89c8d8a3d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,18 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.62
 
+  *) mod_ssl: Fix crashes in PKCS#11 ENGINE support with OpenSSL 3.2.
+     [Joe Orton]
+
+  *) mod_ssl: Add support for loading certs/keys from pkcs11: URIs
+     via OpenSSL 3.x providers.  [Ingo Franzki <ifranzki linux.ibm.com>]
+
+  *) mod_ssl: Restore SSL dumping on trace7 loglevel with OpenSSL >= 3.0.
+     [Ruediger Pluem, Yann Ylavic]
+
+  *) mpm_worker: Fix possible warning (AH00045) about children processes not
+     terminating timely.  [Yann Ylavic]
+
 Changes with Apache 2.4.61
 
   *) SECURITY: CVE-2024-39884: Apache HTTP Server: source code

diff --git a/changes-entries/modssl-pkcs11.txt b/changes-entries/modssl-pkcs11.txt
deleted file mode 100644 (file)
index 391f8a2..0000000
--- a/changes-entries/modssl-pkcs11.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_ssl: Fix crashes in PKCS#11 ENGINE support with OpenSSL 3.2.
-     [Joe Orton]

diff --git a/changes-entries/restore_ssl_dump_with_3.txt b/changes-entries/restore_ssl_dump_with_3.txt
deleted file mode 100644 (file)
index 771f979..0000000
--- a/changes-entries/restore_ssl_dump_with_3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_ssl: Restore SSL dumping on trace7 loglevel with OpenSSL >= 3.0.
-     [Ruediger Pluem, Yann Ylavic]

diff --git a/changes-entries/ssl-providers.txt b/changes-entries/ssl-providers.txt
deleted file mode 100644 (file)
index 65b5655..0000000
--- a/changes-entries/ssl-providers.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_ssl: Add support for loading certs/keys from pkcs11: URIs
-     via OpenSSL 3.x providers.  [Ingo Franzki <ifranzki linux.ibm.com>]

diff --git a/changes-entries/worker_exit.txt b/changes-entries/worker_exit.txt
deleted file mode 100644 (file)
index 5a2e712..0000000
--- a/changes-entries/worker_exit.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mpm_worker: Fix possible warning (AH00045) about children processes not
-     terminating timely.  [Yann Ylavic]