From 40b764994d9251478a0585bcf89437697ed20202 Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 7 Mar 2022 14:53:15 +0000
Subject: [PATCH] Sync CHANGES entries [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898696 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                                    | 6 ++++++
 changes-entries/AP_MAX_LIMIT_XML_BODY.diff | 2 --
 changes-entries/discard_body.diff          | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 changes-entries/AP_MAX_LIMIT_XML_BODY.diff
 delete mode 100644 changes-entries/discard_body.diff

diff --git a/CHANGES b/CHANGES
index 6423a6ab2a8..f391f2bbc92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.53
 
+  *) core: Make sure and check that LimitXMLRequestBody fits in system memory.
+     [Ruediger Pluem, Yann Ylavic]
+
+  *) core: Simpler connection close logic if discarding the request body fails.
+     [Yann Ylavic, Ruediger Pluem]
+
   *) mod_http2: preserve the port number given in a HTTP/1.1
      request that was Upgraded to HTTP/2. Fixes PR65881.
      [Stefan Eissing]
diff --git a/changes-entries/AP_MAX_LIMIT_XML_BODY.diff b/changes-entries/AP_MAX_LIMIT_XML_BODY.diff
deleted file mode 100644
index 07fef3c624c..00000000000
--- a/changes-entries/AP_MAX_LIMIT_XML_BODY.diff
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: Make sure and check that LimitXMLRequestBody fits in system memory.
-     [Ruediger Pluem, Yann Ylavic]
\ No newline at end of file
diff --git a/changes-entries/discard_body.diff b/changes-entries/discard_body.diff
deleted file mode 100644
index 6b467ac5ee3..00000000000
--- a/changes-entries/discard_body.diff
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) core: Simpler connection close logic if discarding the request body fails.
-     [Yann Ylavic, Ruediger Pluem]
\ No newline at end of file
-- 
2.47.3