Merge CHANGES entries [skip ci].

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

diff --git a/CHANGES b/CHANGES
index 664205f98ba9d26919bf6b8dba81a6cdb9121867..3ff8f6d5662bd43b32178e02c494aa9730eb2de9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.47
 
+  *) mpm_event: don't reset connections after lingering close, restoring prior
+     to 2.4.28 behaviour.  [Yann Ylavic]
+
+  *) mpm_event: kill connections in keepalive state only when there is no more
+     workers available, not when the maximum number of connections is reached,
+     restoring prior to 2.4.30 behaviour.  [Yann Ylavic]
+
+  *) mod_unique_id: Use base64url encoding for UNIQUE_ID variable,
+     avoiding the use of '@'.  PR 57044.
+     [Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>]
+
   *) mod_rewrite: Extend the [CO] (cookie) flag of RewriteRule to accept a
      SameSite attribute. [Eric Covener]
 

diff --git a/changes-entries/event_abort_socket_no_reset.txt b/changes-entries/event_abort_socket_no_reset.txt
deleted file mode 100644 (file)
index d26357e..0000000
--- a/changes-entries/event_abort_socket_no_reset.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mpm_event: don't reset connections after lingering close, restoring prior
-     to 2.4.28 behaviour.  [Yann Ylavic]
-

diff --git a/changes-entries/event_keepalive_above_limit.txt b/changes-entries/event_keepalive_above_limit.txt
deleted file mode 100644 (file)
index 4360fa4..0000000
--- a/changes-entries/event_keepalive_above_limit.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mpm_event: kill connections in keepalive state only when there is no more
-     workers available, not when the maximum number of connections is reached,
-     restoring prior to 2.4.30 behaviour.  [Yann Ylavic]
-

diff --git a/changes-entries/pr57044.txt b/changes-entries/pr57044.txt
deleted file mode 100644 (file)
index 3d2d32c..0000000
--- a/changes-entries/pr57044.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_unique_id: Use base64url encoding for UNIQUE_ID variable,
-     avoiding the use of '@'.  PR 57044.
-     [Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>]