From: Eric Covener <covener@apache.org>
Date: Tue, 2 Jun 2026 17:15:34 +0000 (+0000)
Subject: backport, update-changes
X-Git-Tag: 2.4.68-rc1-candidate~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70e16a8e955451d6fe9b8de50a22d80373c6dc12;p=thirdparty%2Fapache%2Fhttpd.git

backport, update-changes



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

diff --git a/CHANGES b/CHANGES
index 199f7d8567..4d21cf5b9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.68
 
+  *) mod_ssl: Add SerialNumber as a recognized attribute type for SSL
+     distinguished name variables.  [Michael Osipov <michaelo apache.org>,
+     Benjamin Demarteau <benjamin.demarteau liege.be>]
+
+  *) mod_ssl: Set auth type to "ClientCert" when client certificate authentication
+     has been performed.  [Michael Osipov <michaelo apache.org>]
+
   *) mod_include: Don't print any of if/elsif/else content when
      a conditional evaluation returns an error. [Eric Covener]
 
diff --git a/STATUS b/STATUS
index bb5ef83524..3318efded6 100644
--- a/STATUS
+++ b/STATUS
@@ -162,24 +162,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_include: handle parse error in conditionals by supressing output
-     Trunk version of patch:
-        https://svn.apache.org/r1934852
-     Backport version for 2.4.x of patch:
-       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/658.diff
-     Can be applied via apply_backport_pr.sh 658
-     +1: covener, jorton, rpluem
-
-  *) mod_ssl: Expose serialNumber (2.5.4.5) as standard env var from certificate DN
-     trunk patch: https://svn.apache.org/r1933908
-     2.4.x patch: svn merge -c 1933908 ^/httpd/httpd/trunk .
-     +1: michaelo, jorton, rpluem
-
-  *) mod_ssl: Set auth type to "ClientCert" after authentication
-     trunk patch: https://svn.apache.org/r1934210
-     2.4.x patch: svn merge -c 1934210 ^/httpd/httpd/trunk .
-     +1: michaelo, jorton, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/changes-entries/ssl-authtype.txt b/changes-entries/ssl-authtype.txt
deleted file mode 100644
index c7c8da0aed..0000000000
--- a/changes-entries/ssl-authtype.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-*) mod_ssl: Set auth type to "ClientCert" when client certificate authentication
-   has been performed.  [Michael Osipov <michaelo apache.org>]
diff --git a/changes-entries/ssl-serialnumber.txt b/changes-entries/ssl-serialnumber.txt
deleted file mode 100644
index af82ca48c0..0000000000
--- a/changes-entries/ssl-serialnumber.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-  *) mod_ssl: Add SerialNumber as a recognized attribute type for SSL
-     distinguished name variables.  [Michael Osipov <michaelo apache.org>,
-     Benjamin Demarteau <benjamin.demarteau liege.be>]
-