* mod_ssl: fix UID env var regression introduced in 2.2.15.

PR54510.

Submitted by: kbrand
Reviewed by: druggeri, wrowe

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

diff --git a/CHANGES b/CHANGES
index cb817cc2ca182748e75d476492a83365bc04e9b8..234cbed62c8394052e023249b2dc84df7747bc50 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.24
 
+  *) mod_ssl: fix a regression with the string rendering of the "UID" RDN
+     introduced in 2.2.15. PR 54510. [Kaspar Brand]
+     
   *) ab: add TLS1.1/TLS1.2 options to -f switch, and adapt output
      to more accurately report the negotiated protocol. PR 53916.
      [Nicolás Pernas Maradei <nico emutex com>, Kaspar Brand]

diff --git a/STATUS b/STATUS
index 1d2178881dc337d3408f926b3672f5412eec5b78..e773abdf1a1cf9abc30f1d2e288875c2602b922c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -106,10 +106,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
              https://issues.apache.org/bugzilla/show_bug.cgi?id=53134#c10
              by the patch author)
 
-   * mod_ssl: fix UID env var regression introduced in 2.2.15. PR54510.
-     2.2.x patch: https://people.apache.org/~kbrand/ssl_vars_uid_PR54510.patch
-     +1: kbrand, druggeri, wrowe
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 83cff2c12da28f0eea8d804e0c0c8a70f20b2e01..61997341d605c67ad04e3f3ce977297a7ed8c85d 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -431,7 +431,7 @@ static const struct {
     { "S",     NID_surname,                1 },
     { "D",     NID_description,            1 },
 #ifdef NID_userId
-    { "UID",   NID_x500UniqueIdentifier,   1 },
+    { "UID",   NID_userId,                 1 },
 #endif
     { "Email", NID_pkcs9_emailAddress,     1 },
     { NULL,    0,                          0 }