svn commit: r1934902 - in httpd/httpd/branches/2.4.x: . changes-entries

Author: covener
Date: Tue Jun  2 17:15:34 2026
New Revision: 1934902

Log:
backport, update-changes

Deleted:
   httpd/httpd/branches/2.4.x/changes-entries/ssl-authtype.txt
   httpd/httpd/branches/2.4.x/changes-entries/ssl-serialnumber.txt
Modified:
   httpd/httpd/branches/2.4.x/CHANGES
   httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/CHANGES
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES	Tue Jun  2 17:14:41 2026	(r1934901)
+++ httpd/httpd/branches/2.4.x/CHANGES	Tue Jun  2 17:15:34 2026	(r1934902)
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS	Tue Jun  2 17:14:41 2026	(r1934901)
+++ httpd/httpd/branches/2.4.x/STATUS	Tue Jun  2 17:15:34 2026	(r1934902)
@@ -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 ]