Merge CHANGES entries [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1884492 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ecd9cc3ccfe780e234f118b9a89d3a6f1f27481c..f15a44167defca6e42a93c4f96c305c826d715e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,36 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mpm_event: don't reset connections after lingering close, restoring prior
+     to 2.4.28 behaviour.  [Yann Ylavic]
+
+  *) mod_dav_fs: Improve logging output when failing to open files for
+     writing.  PR 64413.  [Bingyu Shen <ahshenbingyu gmail.com>]
+
+  *) mod_proxy: Add optional third argument for ProxyRemote, which
+     configures Basic authentication credentials to pass to the remote
+     proxy.  PR 37355.  [Joe Orton]
+
+  *) mod_proxy_http: Fix 100-continue deadlock for spooled request bodies,
+     leading to Request Timeout (408).  PR 63855.  [Yann Ylavic]
+  *) http: Allow unknown response status' lines returned in the form of
+     "HTTP/x.x xxx Status xxx".  [Yann Ylavic]
+
+  *) mod_proxy_fcgi: Honor "SetEnv proxy-sendcl" to forward a chunked
+     Transfer-Encoding from the client, spooling the request body when needed
+     to provide a Content-Length to the backend.  PR 57087.  [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_allowmethods: Allow methods to be added/removed with +/- prefix.  PR64785.
+     [Marcel Montes <spiceman gmail.com>]
+
+  *) mod_unique_id: Use base64url encoding for UNIQUE_ID variable,
+     avoiding the use of '@'.  PR 57044.
+     [Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>]
+
   *) core: add ReadBufferSize, FlushMaxThreshold and FlushMaxPipelined
      directives.  [Yann Ylavic]
 

diff --git a/changes-entries/bz63855.txt b/changes-entries/bz63855.txt
deleted file mode 100644 (file)
index edd5eec..0000000
--- a/changes-entries/bz63855.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-  *) mod_proxy_http: Fix 100-continue deadlock for spooled request bodies,
-     leading to Request Timeout (408).  PR 63855.  [Yann Ylavic]
-
-  *) http: Allow unknown response status' lines returned in the form of
-     "HTTP/x.x xxx Status xxx".  [Yann Ylavic]
-

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/pr37355.txt b/changes-entries/pr37355.txt
deleted file mode 100644 (file)
index 3fbf5c7..0000000
--- a/changes-entries/pr37355.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy: Add optional third argument for ProxyRemote, which
-     configures Basic authentication credentials to pass to the remote
-     proxy.  PR 37355.  [Joe Orton]

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>]

diff --git a/changes-entries/pr57087.txt b/changes-entries/pr57087.txt
deleted file mode 100644 (file)
index 6ee7699..0000000
--- a/changes-entries/pr57087.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy_fcgi: Honor "SetEnv proxy-sendcl" to forward a chunked
-     Transfer-Encoding from the client, spooling the request body when needed
-     to provide a Content-Length to the backend.  PR 57087.  [Yann Ylavic]

diff --git a/changes-entries/pr64413.txt b/changes-entries/pr64413.txt
deleted file mode 100644 (file)
index a11d75b..0000000
--- a/changes-entries/pr64413.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_dav_fs: Improve logging output when failing to open files for
-     writing.  PR 64413.  [Bingyu Shen <ahshenbingyu gmail.com>]
-

diff --git a/changes-entries/pr64785.txt b/changes-entries/pr64785.txt
deleted file mode 100644 (file)
index 4f015c4..0000000
--- a/changes-entries/pr64785.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_allowmethods: Allow methods to be added/removed with +/- prefix.  PR64785.
-     [Marcel Montes <spiceman gmail.com>]
-