Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit b2c43a4efbf3 · 2021-10-08T12:35:38.000+03:00
* PHP-8.0:
  Flush error messages emitted during preloading
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4767,6 +4767,7 @@ static int accel_finish_startup(void)
 			if (accel_preload(ZCG(accel_directives).preload, in_child) != SUCCESS) {
 				ret = FAILURE;
 			}
+			preload_flush(NULL);
 
 			orig_report_memleaks = PG(report_memleaks);
 			PG(report_memleaks) = 0;

Original file line number	Diff line number	Diff line change
`@@ -4767,6 +4767,7 @@ static int accel_finish_startup(void)`
`4767`	`4767`	`if (accel_preload(ZCG(accel_directives).preload, in_child) != SUCCESS) {`
`4768`	`4768`	`ret = FAILURE;`
`4769`	`4769`	`}`
	`4770`	`+ preload_flush(NULL);`
`4770`	`4771`
`4771`	`4772`	`orig_report_memleaks = PG(report_memleaks);`
`4772`	`4773`	`PG(report_memleaks) = 0;`