Skip to content

Commit 84dce33

Browse files
committed
Merge branch 'PHP-5.6' into PHP-7.0
2 parents ced675d + 05033c9 commit 84dce33

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

ext/openssl/openssl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,6 +1318,9 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
13181318
EVP_cleanup();
13191319

13201320
#if OPENSSL_VERSION_NUMBER >= 0x00090805f
1321+
/* prevent accessing locking callback from unloaded extension */
1322+
CRYPTO_set_locking_callback(NULL);
1323+
/* free allocated error strings */
13211324
ERR_free_strings();
13221325
#endif
13231326

0 commit comments

Comments
 (0)