From 84efa962ce7eeeb42233bee3a3fec09ee46735f0 Mon Sep 17 00:00:00 2001
From: Ruediger Pluem <rpluem@apache.org>
Date: Tue, 15 Sep 2020 07:50:26 +0000
Subject: [PATCH] * Update change entries via make update-changes [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1881729 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                                    | 11 +++++++++++
 changes-entries/http2_log_early_errors.txt |  3 ---
 changes-entries/pr64598.txt                |  2 --
 changes-entries/pr64709.txt                |  3 ---
 4 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 changes-entries/http2_log_early_errors.txt
 delete mode 100644 changes-entries/pr64598.txt
 delete mode 100644 changes-entries/pr64709.txt

diff --git a/CHANGES b/CHANGES
index 529539da93c..be1ec1f0ee6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,17 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_http2: Log requests and sent the configured error response in case of
+     early detected errors like too many or too long headers.
+     [Ruediger Pluem, Stefan Eissing]
+
+  *) mod_proxy_uwsgi: Fix a crash when sending environment variables with no
+     value. PR 64598 [Ruediger Pluem]
+
+  *) mod_cgi/mod_cgid: Avoid a second read from a CGI script after a
+     timeout, which effectively doubled the configured timeout setting.
+     PR 64709.  [Joe Orton]
+
   *) core: handle headers when replying a 304 following RFC7234.
      [Giovanni Bechis]
 
diff --git a/changes-entries/http2_log_early_errors.txt b/changes-entries/http2_log_early_errors.txt
deleted file mode 100644
index 29477aa0add..00000000000
--- a/changes-entries/http2_log_early_errors.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_http2: Log requests and sent the configured error response in case of
-     early detected errors like too many or too long headers.
-     [Ruediger Pluem, Stefan Eissing]
diff --git a/changes-entries/pr64598.txt b/changes-entries/pr64598.txt
deleted file mode 100644
index 3647d8a97d1..00000000000
--- a/changes-entries/pr64598.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy_uwsgi: Fix a crash when sending environment variables with no
-     value. PR 64598 [Ruediger Pluem]
diff --git a/changes-entries/pr64709.txt b/changes-entries/pr64709.txt
deleted file mode 100644
index aaa2854ec2e..00000000000
--- a/changes-entries/pr64709.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_cgi/mod_cgid: Avoid a second read from a CGI script after a
-     timeout, which effectively doubled the configured timeout setting.
-     PR 64709.  [Joe Orton]
-- 
2.47.3