Skip to content

Commit ce58ae5

Browse files
committed
Merge branch 'PHP-8.2'
2 parents b7c03d1 + 3d90a24 commit ce58ae5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ext/openssl/openssl.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1324,13 +1324,14 @@ PHP_MSHUTDOWN_FUNCTION(openssl)
13241324
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
13251325
EVP_cleanup();
13261326

1327+
/* prevent accessing locking callback from unloaded extension */
1328+
CRYPTO_set_locking_callback(NULL);
1329+
13271330
#ifndef OPENSSL_NO_ENGINE
13281331
/* Free engine list initialized by OPENSSL_config */
13291332
ENGINE_cleanup();
13301333
#endif
13311334

1332-
/* prevent accessing locking callback from unloaded extension */
1333-
CRYPTO_set_locking_callback(NULL);
13341335
/* free allocated error strings */
13351336
ERR_free_strings();
13361337
CONF_modules_free();

0 commit comments

Comments
 (0)