From 7378d34a2b44dd7ffaeaff147d0278a2cee7d369 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Oct 2019 14:50:17 +0200 Subject: - fix preload, add upstream patch for https://bugs.php.net/78512 - change dependency on nginx-filesystem to weak --- 05c5e5dfde91955263469daa2dd5afcbb5199d17.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 05c5e5dfde91955263469daa2dd5afcbb5199d17.patch (limited to '05c5e5dfde91955263469daa2dd5afcbb5199d17.patch') diff --git a/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch b/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch new file mode 100644 index 0000000..81cdc23 --- /dev/null +++ b/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch @@ -0,0 +1,26 @@ +From 05c5e5dfde91955263469daa2dd5afcbb5199d17 Mon Sep 17 00:00:00 2001 +From: Dmitry Stogov +Date: Mon, 21 Oct 2019 14:52:26 +0300 +Subject: [PATCH] Fixed bug #78512 (Cannot make preload work) + +--- + NEWS | 3 +++ + ext/opcache/ZendAccelerator.c | 5 +++++ + 2 files changed, 8 insertions(+) + +diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c +index 056c7739a0b6..636058dd0875 100644 +--- a/ext/opcache/ZendAccelerator.c ++++ b/ext/opcache/ZendAccelerator.c +@@ -4565,6 +4565,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; -- cgit