Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #78512 (Cannot make preload work)
This commit is contained in:
Dmitry Stogov 2019-10-21 14:53:03 +03:00
commit 42f4bdba2a

View File

@ -4620,6 +4620,11 @@ static int accel_finish_startup(void)
zend_accel_error(ACCEL_LOG_FATAL, "Preloading failed to waitpid(%d)", pid);
return FAILURE;
}
if (ZCSG(preload_script)) {
preload_load();
}
zend_shared_alloc_unlock();
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
return SUCCESS;