archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Disable ZEND_RC_MOD_CHECK() while loading shared extension in FPM
This commit is contained in:
Arnaud Le Blanc 2025-03-17 17:40:23 +01:00
commit 995f11adb1
No known key found for this signature in database
GPG key ID: 0098C05DD15ABC13
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sapi/fpm/fpm/fpm_php.c
View file

@ -93,7 +93,21 @@ int fpm_php_apply_defines_ex(struct key_value_s *kv, int mode) /* {{{ */
if (!strcmp(name, "extension") && *value) {
zval zv;
zend_interned_strings_switch_storage(0);
#if ZEND_RC_DEBUG
bool orig_rc_debug = zend_rc_debug;
/* Loading extensions after php_module_startup() breaks some invariants.
* For instance, it will update the refcount of persistent strings,
* which is normally not allowed at this stage. */
zend_rc_debug = false;
#endif
php_dl(value, MODULE_PERSISTENT, &zv, 1);
#if ZEND_RC_DEBUG
zend_rc_debug = orig_rc_debug;
#endif
zend_interned_strings_switch_storage(1);
return Z_TYPE(zv) == IS_TRUE ? FPM_PHP_INI_EXTENSION_LOADED : FPM_PHP_INI_EXTENSION_FAILED;
}