]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 13 Jun 2019 10:52:22 +0000 (12:52 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 13 Jun 2019 10:52:32 +0000 (12:52 +0200)
1  2 
NEWS
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_module.c

diff --cc NEWS
index 447f6eb82425efba6125a1b5cbae4825421930cd,e072754f78843f1a907cbb9d626b625ed27cbed9..2fe64f4ad351d59423ea132966b64b82b6e7992e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,9 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.21
 +?? ??? ????, PHP 7.3.8
  
+ - Opcache:
+   . Fixed bug #78106 (Path resolution fails if opcache disabled during request).
+     (Nikita)
  
 -27 Jun 2019, PHP 7.2.20
 +27 Jun 2019, PHP 7.3.7
  
  - Core:
    . Fixed bug #76980 (Interface gets skipped if autoloader throws an exception).
index 291cb828f21213b04d8039ca7f966519fc62e38f,0d28e9d3a81d6c7d8bdf957718d7821503ed3e8a..d3d72ff147233c95fba3859a4da1039876431243
@@@ -2358,9 -2212,8 +2358,8 @@@ static void accel_activate(void
                                if (ZCG(root_hash) != buf.st_ino) {
                                        zend_string *key = zend_string_init("opcache.enable", sizeof("opcache.enable")-1, 0);
                                        zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);
 -                                      zend_string_release(key);
 +                                      zend_string_release_ex(key, 0);
                                        zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode");
-                                       ZCG(accelerator_enabled) = 0;
                                        return;
                                }
                        }
Simple merge