diff options
| author | Michael Wallner <mike@php.net> | 2013-10-17 14:53:50 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-10-17 14:53:50 +0200 |
| commit | 5a7ca69e56b8cbe5c8295f18db2aa443a083949b (patch) | |
| tree | 8f07a95488a58796cd38c4c185e029f400ed83d3 /ext/openssl/openssl.c | |
| parent | bd666e2f99acfb1ec53efd300538a8477dedfe1c (diff) | |
| parent | 2aaa3d538a7b93d92c52aec95707d8230f21be65 (diff) | |
| download | php-git-5a7ca69e56b8cbe5c8295f18db2aa443a083949b.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index a52ade0e5c..801b441893 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1183,6 +1183,10 @@ PHP_MINIT_FUNCTION(openssl) php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory TSRMLS_CC); #endif php_stream_xport_register("tls", php_openssl_ssl_socket_factory TSRMLS_CC); +#if OPENSSL_VERSION_NUMBER >= 0x10001001L + php_stream_xport_register("tlsv1.1", php_openssl_ssl_socket_factory TSRMLS_CC); + php_stream_xport_register("tlsv1.2", php_openssl_ssl_socket_factory TSRMLS_CC); +#endif /* override the default tcp socket provider */ php_stream_xport_register("tcp", php_openssl_ssl_socket_factory TSRMLS_CC); @@ -1221,6 +1225,10 @@ PHP_MSHUTDOWN_FUNCTION(openssl) #endif php_stream_xport_unregister("sslv3" TSRMLS_CC); php_stream_xport_unregister("tls" TSRMLS_CC); +#if OPENSSL_VERSION_NUMBER >= 0x10001001L + php_stream_xport_unregister("tlsv1.1" TSRMLS_CC); + php_stream_xport_unregister("tlsv1.2" TSRMLS_CC); +#endif /* reinstate the default tcp handler */ php_stream_xport_register("tcp", php_stream_generic_socket_factory TSRMLS_CC); |