Commit 49b037a6 authored by Rainer Jung's avatar Rainer Jung
Browse files

* 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
parent a95afa77

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -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 ]

modules/ssl/ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -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 }