archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.2' into PHP-7.3

Browse source
This commit is contained in:
Nikita Popov 2019-06-13 12:52:22 +02:00
commit bada2049ca
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -2,6 +2,9 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.8 ?? ??? ????, PHP 7.3.8
- Opcache:
. Fixed bug #78106 (Path resolution fails if opcache disabled during request).
(Nikita)
27 Jun 2019, PHP 7.3.7 27 Jun 2019, PHP 7.3.7

1
ext/opcache/ZendAccelerator.c
View file

@ -2360,7 +2360,6 @@ static void accel_activate(void)
zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME); zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);
zend_string_release_ex(key, 0); zend_string_release_ex(key, 0);
zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode"); zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode");
ZCG(accelerator_enabled) = 0;
return; return;
} }
} }

4
ext/opcache/tests/bug78106.phpt
View file

@ -1,7 +1,5 @@
--TEST-- --TEST--
Bug #78106: PHP Fatal error: Uncaught Error: Class 'Phpfastcache\Config\Config' not found Bug #78106: Path resolution fails if opcache disabled during request
--XFAIL--
Not fixed yet
--FILE-- --FILE--
<?php <?php

1
ext/opcache/zend_accelerator_module.c
View file

@ -240,6 +240,7 @@ static ZEND_INI_MH(OnEnable)
return FAILURE; return FAILURE;
} else { } else {
*p = 0; *p = 0;
ZCG(accelerator_enabled) = 0;
return SUCCESS; return SUCCESS;
} }
} }