From 1736a7f48e9528330ebe6a2ee1dbb4518d688943 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 9 Sep 2021 14:34:07 +0000 Subject: [PATCH] Sync CHANGES [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893178 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ changes-entries/ssl_keylogging_backport_1869842.txt | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 changes-entries/ssl_keylogging_backport_1869842.txt diff --git a/CHANGES b/CHANGES index a52c2e7317d..f41719b6f94 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.49 + *) mod_ssl: Support logging private key material for use with + wireshark via log file given by SSLKEYLOGFILE environment + variable. Requires OpenSSL 1.1.1. PR 63391. [Joe Orton] + *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and "ProxyPassInterpolateEnv On" are configured. PR 65549. [Joel Self ] diff --git a/changes-entries/ssl_keylogging_backport_1869842.txt b/changes-entries/ssl_keylogging_backport_1869842.txt deleted file mode 100644 index af40897bd33..00000000000 --- a/changes-entries/ssl_keylogging_backport_1869842.txt +++ /dev/null @@ -1,3 +0,0 @@ - *) mod_ssl: Support logging private key material for use with - wireshark via log file given by SSLKEYLOGFILE environment - variable. Requires OpenSSL 1.1.1. PR 63391. [Joe Orton] -- 2.47.2