Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit bada2049ca44 · 2019-06-13T12:52:32.000+02:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.8
 
+- Opcache:
+  . Fixed bug #78106 (Path resolution fails if opcache disabled during request).
+    (Nikita)
 
 27 Jun 2019, PHP 7.3.7
 
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -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_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;
 				}
 			}
diff --git 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
@@ -240,6 +240,7 @@ static ZEND_INI_MH(OnEnable)
 			return FAILURE;
 		} else {
 			*p = 0;
+			ZCG(accelerator_enabled) = 0;
 			return SUCCESS;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2360,7 +2360,6 @@ static void accel_activate(void)`
`2360`	`2360`	`zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);`
`2361`	`2361`	`zend_string_release_ex(key, 0);`
`2362`	`2362`	`zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode");`
`2363`		`- ZCG(accelerator_enabled) = 0;`
`2364`	`2363`	`return;`
`2365`	`2364`	`}`
`2366`	`2365`	`}`