diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-12-09 15:07:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-12-09 15:07:39 +0300 |
| commit | 62826e95d22e9e0db298a476636b996bce49c295 (patch) | |
| tree | 9cb45b3ca8fc3964e1ae0a4a58b72161d4e78222 /ext/gd | |
| parent | 796d11c942ca056b9fb63c90fc200e788a6618ef (diff) | |
| parent | 92c23e1fd36b89bcc835fcd3e49e6ff33d1b1ca8 (diff) | |
| download | php-git-62826e95d22e9e0db298a476636b996bce49c295.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Call zend_unregister_ini_entries() when unload extension loaded through dl() without MSHUTDOWN callback. Extensions with MSHUTDOWN should use UNREGISTER_INI_ENTRIES().
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/gd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 543e08466c..d04aeacb91 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -595,6 +595,7 @@ PHP_MSHUTDOWN_FUNCTION(gd) #if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED) gdFontCacheMutexShutdown(); #endif + UNREGISTER_INI_ENTRIES(); return SUCCESS; } /* }}} */ |