com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/openssl/openssl.c

From: Date: Mon, 25 Jan 2016 17:19:18 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90755@lists.php.net to get a copy of this message
Commit: 67c1921e2b01f298977c15e7352b6002ed175ea1 Author: Jakub Zelenka <bukka@php.net> Mon, 25 Jan 2016 17:19:18 +0000 Parents: c140bbb5dbf76e051205d33911df12bd33b270ca a63d0f55da87fc620c66f1b909d752d7c8b1159c Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67c1921e2b01f298977c15e7352b6002ed175ea1 Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM ext/openssl/openssl.c Diff: diff --cc ext/openssl/openssl.c index a8ecbb2,88e396c..2e4b002 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@@ -1317,21 -1277,23 +1317,25 @@@ PHP_MSHUTDOWN_FUNCTION(openssl { EVP_cleanup(); + #if OPENSSL_VERSION_NUMBER >= 0x00090805f + ERR_free_strings(); + #endif + - php_unregister_url_stream_wrapper("https" TSRMLS_CC); - php_unregister_url_stream_wrapper("ftps" TSRMLS_CC); + php_unregister_url_stream_wrapper("https"); + php_unregister_url_stream_wrapper("ftps"); - php_stream_xport_unregister("ssl" TSRMLS_CC); + php_stream_xport_unregister("ssl"); #ifndef OPENSSL_NO_SSL2 - php_stream_xport_unregister("sslv2" TSRMLS_CC); + php_stream_xport_unregister("sslv2"); +#endif +#ifndef OPENSSL_NO_SSL3 + php_stream_xport_unregister("sslv3"); #endif - php_stream_xport_unregister("sslv3" TSRMLS_CC); - php_stream_xport_unregister("tls" TSRMLS_CC); - php_stream_xport_unregister("tlsv1.0" TSRMLS_CC); + php_stream_xport_unregister("tls"); + php_stream_xport_unregister("tlsv1.0"); #if OPENSSL_VERSION_NUMBER >= 0x10001001L - php_stream_xport_unregister("tlsv1.1" TSRMLS_CC); - php_stream_xport_unregister("tlsv1.2" TSRMLS_CC); + php_stream_xport_unregister("tlsv1.1"); + php_stream_xport_unregister("tlsv1.2"); #endif /* reinstate the default tcp handler */

« previous php.cvs (#90755) next »