Sync CHANGES entries [skip ci]

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

diff --git a/CHANGES b/CHANGES
index d485d9470e18b7614c484750aa3c599253cf74e7..6423a6ab2a82e18ce2f5c5f411034f65956c2d15 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.53
 
+  *) mod_http2: preserve the port number given in a HTTP/1.1
+     request that was Upgraded to HTTP/2. Fixes PR65881.
+     [Stefan Eissing]
+
+  *) mod_proxy: Allow for larger worker name.  PR 53218.  [Yann Ylavic]
+
   *) dbm: Split the loading of a dbm driver from the opening of a dbm file. When
      an attempt to load a dbm driver fails, log clearly which driver triggered
      the error (not "default"), and what the error was. [Graham Leggett]

diff --git a/changes-entries/pr65881.txt b/changes-entries/pr65881.txt
deleted file mode 100644 (file)
index 816158a..0000000
--- a/changes-entries/pr65881.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_http2: preserve the port number given in a HTTP/1.1
-     request that was Upgraded to HTTP/2. Fixes PR65881.
-     [Stefan Eissing]
\ No newline at end of file

diff --git a/changes-entries/proxy_shared_name_ex.txt b/changes-entries/proxy_shared_name_ex.txt
deleted file mode 100644 (file)
index dd75ddd..0000000
--- a/changes-entries/proxy_shared_name_ex.txt
+++ /dev/null
@@ -1 +0,0 @@
-  *) mod_proxy: Allow for larger worker name.  PR 53218.  [Yann Ylavic]