diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-18 19:32:14 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-18 19:32:14 -0700 |
| commit | cb9f58d04615c18c700a03f9cbc789dbbc823355 (patch) | |
| tree | ded41d587d8b5b662455439e0a845b401dcd3797 | |
| parent | 8fa7800ce1101f7721de223acfea733cee344a4d (diff) | |
| parent | 321bafccde1da30b89c4381ab9c7070ea5253868 (diff) | |
| download | php-git-cb9f58d04615c18c700a03f9cbc789dbbc823355.tar.gz | |
Merge branch 'pull-request/1203'
* pull-request/1203:
Update openssl.c
| -rw-r--r-- | ext/openssl/openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 0c20fa1e15..1697d80bb9 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1250,7 +1250,9 @@ PHP_MINIT_FUNCTION(openssl) } php_stream_xport_register("ssl", php_openssl_ssl_socket_factory); +#ifndef OPENSSL_NO_SSL3 php_stream_xport_register("sslv3", php_openssl_ssl_socket_factory); +#endif #ifndef OPENSSL_NO_SSL2 php_stream_xport_register("sslv2", php_openssl_ssl_socket_factory); #endif @@ -1299,7 +1301,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl) #ifndef OPENSSL_NO_SSL2 php_stream_xport_unregister("sslv2"); #endif +#ifndef OPENSSL_NO_SSL3 php_stream_xport_unregister("sslv3"); +#endif php_stream_xport_unregister("tls"); php_stream_xport_unregister("tlsv1.0"); #if OPENSSL_VERSION_NUMBER >= 0x10001001L |