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 3186b8e334ba2284865cad0a0a43e3c76e66db2f..a1cf74dc3b6a592c1525735d91a88b8ac45fb10f 100644 (file)
--- 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 (file)
index 9f5f33a..0000000
--- 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 (file)
index 9f6ce95..0000000
--- 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 (file)
index c2a3eb6..0000000
--- 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 (file)
index 18d4d1a..0000000
--- 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]