]> granicus.if.org Git - apache/commit
Merge r1679470 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 18 May 2015 11:07:07 +0000 (11:07 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 18 May 2015 11:07:07 +0000 (11:07 +0000)
commit8ad013bf7bfe3cfa3701fd2abc19ea8c9c6bd408
tree77b4fcce335752fde4551a9147d8553862df0dfb
parent06ad550e82b154131da52e0a0c2513f9aa27893f
Merge r1679470 from trunk:

mod_ssl: follow up to r1527291.
Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for
SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was
not yet included by default.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679989 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/ssl/ssl_engine_init.c