From: Eric Covener <covener@apache.org>
Date: Mon, 24 Jun 2024 18:16:32 +0000 (+0000)
Subject: make update-changes
X-Git-Tag: 2.4.60-rc1-candidate~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b59bef835dc3c30623a0d6d205c570383d78176;p=thirdparty%2Fapache%2Fhttpd.git

make update-changes


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

diff --git a/CHANGES b/CHANGES
index 3186b8e334b..a1cf74dc3b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,18 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.60
 
+  *) mod_proxy: Fix DNS requests and connections closed before the
+     configured addressTTL.  BZ 69126.  [Yann Ylavic]
+
+  *) core: On Linux, log the real thread ID in error logs.  [Joe Orton]
+
+  *) core: Support zone/scope in IPv6 link-local addresses in Listen and
+     VirtualHost directives (requires APR 1.7.x or later).  PR 59396
+     [Joe Orton]
+
+  *) mod_ssl: Reject client-initiated renegotiation with a TLS alert
+     (rather than connection closure).  [Joe Orton, Yann Ylavic]
+
   *) Updated mime.types.  [Mohamed Akram <mohd.akram outlook.com>,
      Adam Silverstein <adamsilverstein earthboundhosting.com>]
 
diff --git a/changes-entries/fix_proxy_determine_address.txt b/changes-entries/fix_proxy_determine_address.txt
deleted file mode 100644
index 9f5f33a35c1..00000000000
--- a/changes-entries/fix_proxy_determine_address.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_proxy: Fix DNS requests and connections closed before the
-     configured addressTTL.  BZ 69126.  [Yann Ylavic]
diff --git a/changes-entries/linux-log-tid.txt b/changes-entries/linux-log-tid.txt
deleted file mode 100644
index 9f6ce953977..00000000000
--- a/changes-entries/linux-log-tid.txt
+++ /dev/null
@@ -1 +0,0 @@
- *) core: On Linux, log the real thread ID in error logs.  [Joe Orton]
diff --git a/changes-entries/modssl-no-reneg.txt b/changes-entries/modssl-no-reneg.txt
deleted file mode 100644
index c2a3eb614b6..00000000000
--- a/changes-entries/modssl-no-reneg.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_ssl: Reject client-initiated renegotiation with a TLS alert
-     (rather than connection closure).  [Joe Orton, Yann Ylavic]
diff --git a/changes-entries/pr59396.txt b/changes-entries/pr59396.txt
deleted file mode 100644
index 18d4d1a0b11..00000000000
--- a/changes-entries/pr59396.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) core: Support zone/scope in IPv6 link-local addresses in Listen and
-     VirtualHost directives (requires APR 1.7.x or later).  PR 59396
-     [Joe Orton]