diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-08 18:36:36 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-08 18:36:36 +0100 |
| commit | 84dce33b048ff78872664bc8bf2535ee87c88446 (patch) | |
| tree | e8000a701d45a060bdbaf04d1fc6bafea52e7dd0 /ext/openssl | |
| parent | ced675de22a85de6f4aa25cfd1fb7670fcee7bb4 (diff) | |
| parent | 05033c9ebd015baf825581e5725a594da277d560 (diff) | |
| download | php-git-84dce33b048ff78872664bc8bf2535ee87c88446.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 07f41ce8b9..2e8aa9a60d 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1318,6 +1318,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl) EVP_cleanup(); #if OPENSSL_VERSION_NUMBER >= 0x00090805f + /* prevent accessing locking callback from unloaded extension */ + CRYPTO_set_locking_callback(NULL); + /* free allocated error strings */ ERR_free_strings(); #endif |