summaryrefslogtreecommitdiffstats
path: root/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-10-21 14:50:17 +0200
committerRemi Collet <remi@remirepo.net>2019-10-21 14:50:17 +0200
commit7378d34a2b44dd7ffaeaff147d0278a2cee7d369 (patch)
tree71899f80f17fd0e092b98e1c9417d3357cc78aa5 /05c5e5dfde91955263469daa2dd5afcbb5199d17.patch
parentf9d71a15a180592ef19ca38c4e1679443ee9823f (diff)
- fix preload, add upstream patch for https://bugs.php.net/78512
- change dependency on nginx-filesystem to weak
Diffstat (limited to '05c5e5dfde91955263469daa2dd5afcbb5199d17.patch')
-rw-r--r--05c5e5dfde91955263469daa2dd5afcbb5199d17.patch26
1 files changed, 26 insertions, 0 deletions
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 <dmitry@zend.com>
+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;