From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 13 Jun 2019 10:52:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0alpha2~109^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bada2049ca4404ffb12ad5a009de23f638c2bfda;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

bada2049ca4404ffb12ad5a009de23f638c2bfda
diff --cc NEWS
index 447f6eb824,e072754f78..2fe64f4ad3
--- a/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).
diff --cc ext/opcache/ZendAccelerator.c
index 291cb828f2,0d28e9d3a8..d3d72ff147
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -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;
  				}
  			}