From ac502d58fb421331e64ec6bde82eb63167bd8b7f Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 1 Apr 2021 10:28:51 +0000 Subject: [PATCH] Apply CHANGES. [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1888270 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 26 ++++++++++++++++++++ changes-entries/core_httpd_ssl.txt | 2 -- changes-entries/h2_close_race.txt | 3 --- changes-entries/mod_md-missing-resources.txt | 2 -- changes-entries/mod_unique_id.txt | 3 --- changes-entries/pr59798.txt | 3 --- changes-entries/pr63074.txt | 2 -- changes-entries/pr65169.txt | 6 ----- 8 files changed, 26 insertions(+), 21 deletions(-) delete mode 100644 changes-entries/core_httpd_ssl.txt delete mode 100644 changes-entries/h2_close_race.txt delete mode 100644 changes-entries/mod_md-missing-resources.txt delete mode 100644 changes-entries/mod_unique_id.txt delete mode 100644 changes-entries/pr59798.txt delete mode 100644 changes-entries/pr63074.txt delete mode 100644 changes-entries/pr65169.txt diff --git a/CHANGES b/CHANGES index 076a8c711b..f48fe6536d 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,32 @@ Changes with Apache 2.5.1 + *) mod_md: Tolerate a missing "revokeCert" or "keyChange" resource. + [Fraser Tweedale ] + + *) mod_ssl: Add SSL_{CLIENT,SERVER}_B64CERT variables with + base64-encoded DER certificates. Add SSL_CLIENT_B64CERT_CHAIN_n + equivalents for SSL_CLIENT_CERT_CHAIN_n, and new + "ExportBase64CertData" argument for SSLOptions. PR 65169. + [Joe Orton] + + *) mod_proxy_balancer: Include nonce in XML output. PR 63074. + Federico Mennite + + *) mod_http2: Fixed a race condition that could lead to streams being + aborted (RST to the client), although a response had been produced. + [Stefan Eissing] + + *) mod_unique_id: Fix potential duplicated ID generation under heavy load. + PR 65159 + [Jonas Müntener , Christophe Jaillet] + + *) core: provide ap_ssl_* functions in new http_ssl.h header file. + [Stefan Eissing] + + *) mod_socache_shmcb: Avoid double SHM cleanup and possible crash on + restart/stop. PR 59798. [Yann Ylavic] + *) mod_md: v2.4.0 with improvements and bugfixes - MDPrivateKeys allows the specification of several types. Beside "RSA" plus optional key lengths elliptic curves can be configured. This means you can diff --git a/changes-entries/core_httpd_ssl.txt b/changes-entries/core_httpd_ssl.txt deleted file mode 100644 index 4b1494daad..0000000000 --- a/changes-entries/core_httpd_ssl.txt +++ /dev/null @@ -1,2 +0,0 @@ - *) core: provide ap_ssl_* functions in new http_ssl.h header file. - [Stefan Eissing] diff --git a/changes-entries/h2_close_race.txt b/changes-entries/h2_close_race.txt deleted file mode 100644 index 6ac04da97b..0000000000 --- a/changes-entries/h2_close_race.txt +++ /dev/null @@ -1,3 +0,0 @@ - *) mod_http2: Fixed a race condition that could lead to streams being - aborted (RST to the client), although a response had been produced. - [Stefan Eissing] diff --git a/changes-entries/mod_md-missing-resources.txt b/changes-entries/mod_md-missing-resources.txt deleted file mode 100644 index 301d64f957..0000000000 --- a/changes-entries/mod_md-missing-resources.txt +++ /dev/null @@ -1,2 +0,0 @@ - *) mod_md: Tolerate a missing "revokeCert" or "keyChange" resource. - [Fraser Tweedale ] diff --git a/changes-entries/mod_unique_id.txt b/changes-entries/mod_unique_id.txt deleted file mode 100644 index e5d8dba619..0000000000 --- a/changes-entries/mod_unique_id.txt +++ /dev/null @@ -1,3 +0,0 @@ - *) mod_unique_id: Fix potential duplicated ID generation under heavy load. - PR 65159 - [Jonas Müntener , Christophe Jaillet] diff --git a/changes-entries/pr59798.txt b/changes-entries/pr59798.txt deleted file mode 100644 index cb83aa9fab..0000000000 --- a/changes-entries/pr59798.txt +++ /dev/null @@ -1,3 +0,0 @@ - *) mod_socache_shmcb: Avoid double SHM cleanup and possible crash on - restart/stop. PR 59798. [Yann Ylavic] - diff --git a/changes-entries/pr63074.txt b/changes-entries/pr63074.txt deleted file mode 100644 index c4ed22c5c1..0000000000 --- a/changes-entries/pr63074.txt +++ /dev/null @@ -1,2 +0,0 @@ - *) mod_proxy_balancer: Include nonce in XML output. PR 63074. - Federico Mennite diff --git a/changes-entries/pr65169.txt b/changes-entries/pr65169.txt deleted file mode 100644 index 9f742e6665..0000000000 --- a/changes-entries/pr65169.txt +++ /dev/null @@ -1,6 +0,0 @@ - *) mod_ssl: Add SSL_{CLIENT,SERVER}_B64CERT variables with - base64-encoded DER certificates. Add SSL_CLIENT_B64CERT_CHAIN_n - equivalents for SSL_CLIENT_CERT_CHAIN_n, and new - "ExportBase64CertData" argument for SSLOptions. PR 65169. - [Joe Orton] -