You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2013/02/12 12:51:17 UTC
svn commit: r1445112 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ssl/ssl_engine_vars.c
Author: rjung
Date: Tue Feb 12 11:51:17 2013
New Revision: 1445112
URL: http://svn.apache.org/r1445112
Log:
* mod_ssl: fix UID env var regression introduced in 2.2.15.
PR54510.
Submitted by: kbrand
Reviewed by: druggeri, wrowe
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1445112&r1=1445111&r2=1445112&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Feb 12 11:51:17 2013
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1445112&r1=1445111&r2=1445112&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Feb 12 11:51:17 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c?rev=1445112&r1=1445111&r2=1445112&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c Tue Feb 12 11:51:17 2013
@@ -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 }