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

diff --git a/CHANGES b/CHANGES
index a52c2e7317d9555a8e447e7cfda27f3494dd3473..f41719b6f9462ce51ba5c33e813b986f2058d146 100644 (file)
--- 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 <joelself gmail.com>]

diff --git a/changes-entries/ssl_keylogging_backport_1869842.txt b/changes-entries/ssl_keylogging_backport_1869842.txt
deleted file mode 100644 (file)
index af40897..0000000
--- 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]