diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:51:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-13 12:51:35 +0200 |
| commit | f1a81380554070d7f4b0c6dcd1202364ebf3d252 (patch) | |
| tree | 4c18cb8ab87ff800ef12a88a9a365e4f0098d646 | |
| parent | f8a68fd9350ac97d33d1773453c4e9d47a97b33f (diff) | |
| download | php-git-f1a81380554070d7f4b0c6dcd1202364ebf3d252.tar.gz | |
Fixed bug #78106
When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 1 | ||||
| -rw-r--r-- | ext/opcache/tests/bug78106.phpt | 4 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 1 |
4 files changed, 5 insertions, 4 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2019, PHP 7.2.21 +- Opcache: + . Fixed bug #78106 (Path resolution fails if opcache disabled during request). + (Nikita) 27 Jun 2019, PHP 7.2.20 diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index b57d446df5..0d28e9d3a8 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2214,7 +2214,6 @@ static void accel_activate(void) zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME); zend_string_release(key); zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode"); - ZCG(accelerator_enabled) = 0; return; } } diff --git a/ext/opcache/tests/bug78106.phpt b/ext/opcache/tests/bug78106.phpt index 86c8acd3ae..55cc53e767 100644 --- a/ext/opcache/tests/bug78106.phpt +++ b/ext/opcache/tests/bug78106.phpt @@ -1,7 +1,5 @@ --TEST-- -Bug #78106: PHP Fatal error: Uncaught Error: Class 'Phpfastcache\Config\Config' not found ---XFAIL-- -Not fixed yet +Bug #78106: Path resolution fails if opcache disabled during request --FILE-- <?php diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 4d4de77993..d74b2ac644 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -240,6 +240,7 @@ static ZEND_INI_MH(OnEnable) return FAILURE; } else { *p = 0; + ZCG(accelerator_enabled) = 0; return SUCCESS; } } |