Sync CHANGES entries [skip ci].

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

diff --git a/CHANGES b/CHANGES
index bdab5f9d8f2c2564bc3d163554481b46ac63c8ab..d938c41917509925ef063ee8d067fb655b5831ee 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,46 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mpm_event: Fix graceful stop/restart of children processes if connections
+     are in lingering close for too long.  [Yann Ylavic]
+
+  *) mod_md: fixed a potential null pointer dereference if ACME/OCSP
+     server returned 2xx responses without content type. Reported by chuangwen.
+     [chuangwen, Stefan Eissing]
+
+  * core/mpm: add hook 'child_stopping` that gets called when the MPM is
+    stopping a child process. The additional `graceful` parameter allows
+    registered hooks to free resources early during a graceful shutdown.
+    [Yann Ylavic, Stefan Eissing]
+
+  *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
+     balancer-manager, which can lead to a crash.  [Yann Ylavic]
+
+  *) mod_http2:
+   - Aborting requests via RST_STREAM no longer affect the available
+     resources of a connection when the first chunk of the response
+     body has been sent.
+   - H2Min/MaxWorkers behave as intended again. The module will initially
+     create H2MinWorkers threads and add up to H2MaxWorkers when needed. These
+     additional workers time out when idle after H2MaxWorkerIdleSeconds and
+     disappear again.
+   - Added a timeout to h2 worker cleanup to exit latest after 5 seconds of
+     waiting on idle workers to terminate. This happens after all connections
+     have been processed. a WARNING is logged in case workers lagged behind.
+   - When the shutdown of a child is detected (e.g. graceful shutdown), the
+     module will terminate all idle workers above H2MinWorkers right away.
+     This detection currently only happens when a HTTP/2 connection is active.
+     [Stefan Eissing]
+
+  *) mod_md:
+     - Domain names in `<MDomain ...>` can now appear in quoted form.
+     - Fixed a failure in ACME challenge selection that aborted further searches
+       when the tls-alpn-01 method did not seem to be suitable.
+     - Changed the tls-alpn-01 setup to only become unsuitable when none of the
+       dns names showed support for a configured 'Protocols ... acme-tls/1'. This
+       allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.
+     [Stefan Eissing]
+
   *) core/mod_proxy/mod_ssl:
      Adding `outgoing` flag to conn_rec, indicating a connection is
      initiated by the server to somewhere, in contrast to incoming

diff --git a/changes-entries/ap_proxy_sync_balancer.txt b/changes-entries/ap_proxy_sync_balancer.txt
deleted file mode 100644 (file)
index 208a29f..0000000
--- a/changes-entries/ap_proxy_sync_balancer.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
-     balancer-manager, which can lead to a crash.  [Yann Ylavic]

diff --git a/changes-entries/core_child_stopping.txt b/changes-entries/core_child_stopping.txt
deleted file mode 100644 (file)
index c85230e..0000000
--- a/changes-entries/core_child_stopping.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  * core/mpm: add hook 'child_stopping` that gets called when the MPM is
-    stopping a child process. The additional `graceful` parameter allows
-    registered hooks to free resources early during a graceful shutdown.
-    [Yann Ylavic, Stefan Eissing]

diff --git a/changes-entries/h2_workers_dynamic.txt b/changes-entries/h2_workers_dynamic.txt
deleted file mode 100644 (file)
index 2de102e..0000000
--- a/changes-entries/h2_workers_dynamic.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-  *) mod_http2:
-   - Aborting requests via RST_STREAM no longer affect the available
-     resources of a connection when the first chunk of the response
-     body has been sent.
-   - H2Min/MaxWorkers behave as intended again. The module will initially
-     create H2MinWorkers threads and add up to H2MaxWorkers when needed. These
-     additional workers time out when idle after H2MaxWorkerIdleSeconds and
-     disappear again.
-   - Added a timeout to h2 worker cleanup to exit latest after 5 seconds of
-     waiting on idle workers to terminate. This happens after all connections
-     have been processed. a WARNING is logged in case workers lagged behind.
-   - When the shutdown of a child is detected (e.g. graceful shutdown), the
-     module will terminate all idle workers above H2MinWorkers right away.
-     This detection currently only happens when a HTTP/2 connection is active.
-     [Stefan Eissing]
-

diff --git a/changes-entries/md_2_4_4_fixes.txt b/changes-entries/md_2_4_4_fixes.txt
deleted file mode 100644 (file)
index 7ae03c9..0000000
--- a/changes-entries/md_2_4_4_fixes.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-  *) mod_md:
-     - Domain names in `<MDomain ...>` can now appear in quoted form.
-     - Fixed a failure in ACME challenge selection that aborted further searches
-       when the tls-alpn-01 method did not seem to be suitable.
-     - Changed the tls-alpn-01 setup to only become unsuitable when none of the
-       dns names showed support for a configured 'Protocols ... acme-tls/1'. This
-       allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.
-     [Stefan Eissing]

diff --git a/changes-entries/md_fix_potential_nullpointer.txt b/changes-entries/md_fix_potential_nullpointer.txt
deleted file mode 100644 (file)
index f7c3e2d..0000000
--- a/changes-entries/md_fix_potential_nullpointer.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_md: fixed a potential null pointer dereference if ACME/OCSP
-     server returned 2xx responses without content type. Reported by chuangwen.
-     [chuangwen, Stefan Eissing]

diff --git a/changes-entries/mpm_event_graceful.txt b/changes-entries/mpm_event_graceful.txt
deleted file mode 100644 (file)
index 3bf61f3..0000000
--- a/changes-entries/mpm_event_graceful.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mpm_event: Fix graceful stop/restart of children processes if connections
-     are in lingering close for too long.  [Yann Ylavic]