From: Eric Covener <covener@apache.org>
Date: Tue, 7 Jan 2025 19:36:19 +0000 (+0000)
Subject: make update-changes
X-Git-Tag: 2.4.63-candidate~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2072671e8688cf173498d3f0d8ca150b2c6b9970;p=thirdparty%2Fapache%2Fhttpd.git

make update-changes

[skip ci]


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

diff --git a/CHANGES b/CHANGES
index 58003794350..d1f778a6662 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.63
 
+  *) mod_log_config: Fix merging for the "LogFormat" directive.
+     PR: 65222. [Michael Kaufmann <mail michael-kaufmann.ch>]
+
+  *) mod_lua: Make r.ap_auth_type writable.  PR 62497.
+     [Michael Osipov <michaelo apache.org>]
+
   *) mod_md: update to version 2.4.29
      - Fixed HTTP-01 challenges to not carry a final newline, as some ACME
        server fail to ignore it. [Michael Kaufmann (@mkauf)]
diff --git a/changes-entries/pr62497.txt b/changes-entries/pr62497.txt
deleted file mode 100644
index c4f555d066b..00000000000
--- a/changes-entries/pr62497.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_lua: Make r.ap_auth_type writable.  PR 62497.
-     [Michael Osipov <michaelo apache.org>]
diff --git a/changes-entries/pr65222.txt b/changes-entries/pr65222.txt
deleted file mode 100644
index 8efffd6d20b..00000000000
--- a/changes-entries/pr65222.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-  *) mod_log_config: Fix merging for the "LogFormat" directive.
-     PR: 65222. [Michael Kaufmann <mail michael-kaufmann.ch>]