]> granicus.if.org Git - apache/commit
merge r1222921 from trunk:
authorKaspar Brand <kbrand@apache.org>
Sat, 24 Dec 2011 06:43:48 +0000 (06:43 +0000)
committerKaspar Brand <kbrand@apache.org>
Sat, 24 Dec 2011 06:43:48 +0000 (06:43 +0000)
commit6eb443666cfd5c0ef9c477c75390f15d9bf0dd11
treea50daf1dc3d5bf4075ee8c628c093ae6a31c8efe
parentea32bc39c2b7db5991df9c549ef3bd8e5d7c40b3
merge r1222921 from trunk:

SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when
compiled against OpenSSL 1.0.1 or later. Update documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1222922 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/manual/mod/mod_ssl.xml
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_private.h