diff options
| author | Remi Collet <remi@remirepo.net> | 2019-10-23 09:35:32 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-10-23 09:35:32 +0200 |
| commit | 6db3cf2aa850b172b557a56d59a3dae78eead5f0 (patch) | |
| tree | e9161fecf2060bb0d33885115a3f2b544f414960 /598bf7f5d5f9c76fd003590083c98736eb7702ab.patch | |
| parent | 7378d34a2b44dd7ffaeaff147d0278a2cee7d369 (diff) | |
fix preload, add more upstream patches for #78713 #78716
Diffstat (limited to '598bf7f5d5f9c76fd003590083c98736eb7702ab.patch')
| -rw-r--r-- | 598bf7f5d5f9c76fd003590083c98736eb7702ab.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/598bf7f5d5f9c76fd003590083c98736eb7702ab.patch b/598bf7f5d5f9c76fd003590083c98736eb7702ab.patch new file mode 100644 index 0000000..d7ac048 --- /dev/null +++ b/598bf7f5d5f9c76fd003590083c98736eb7702ab.patch @@ -0,0 +1,22 @@ +From 598bf7f5d5f9c76fd003590083c98736eb7702ab Mon Sep 17 00:00:00 2001 +From: "Christoph M. Becker" <cmbecker69@gmx.de> +Date: Tue, 22 Oct 2019 17:53:34 +0200 +Subject: [PATCH] Fix typo + +--- + ext/ffi/ffi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c +index 4b7144e11ccc..17e8a8409d1f 100644 +--- a/ext/ffi/ffi.c ++++ b/ext/ffi/ffi.c +@@ -3359,7 +3359,7 @@ ZEND_METHOD(FFI, load) /* {{{ */ + ZEND_PARSE_PARAMETERS_END(); + + if (CG(compiler_options) & ZEND_COMPILE_PRELOAD_IN_CHILD) { +- zend_throw_error(zend_ffi_exception_ce, "FFI::load() doesn't work in conjunction with \"opcache.pelaod_user\". Use \"ffi.preload\" instead."); ++ zend_throw_error(zend_ffi_exception_ce, "FFI::load() doesn't work in conjunction with \"opcache.preload_user\". Use \"ffi.preload\" instead."); + return; + } + |