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 199f7d85671d93f0b201763c6b5c72c455928603..4d21cf5b9fe2b84a19f80990602167af5d8042d2 100644 (file)
--- 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 bb5ef83524cf141580197763894ffab6714e929d..3318efded6dcf145dd17cd12bd8285e36f66e4e8 100644 (file)
--- 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 (file)
index c7c8da0..0000000
--- 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 (file)
index af82ca4..0000000
--- 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>]
-