diff options
| author | Remi Collet <remi@remirepo.net> | 2019-09-06 11:13:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-09-06 11:13:39 +0200 |
| commit | 670509006a66772a5a286b1bcc51c0ff11474b5a (patch) | |
| tree | 1079084da49834963ad28b592ec66165f5bcc5ea /81315368e643c714319b03809d18170adfb46021.patch | |
| parent | c0bf768b998fc77bd9a35e5849ac79487f657f52 (diff) | |
add upstream patches for 7.4.0RC1
Diffstat (limited to '81315368e643c714319b03809d18170adfb46021.patch')
| -rw-r--r-- | 81315368e643c714319b03809d18170adfb46021.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/81315368e643c714319b03809d18170adfb46021.patch b/81315368e643c714319b03809d18170adfb46021.patch new file mode 100644 index 0000000..7f3d0c7 --- /dev/null +++ b/81315368e643c714319b03809d18170adfb46021.patch @@ -0,0 +1,23 @@ +From 81315368e643c714319b03809d18170adfb46021 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 6 Sep 2019 11:11:37 +0200 +Subject: [PATCH] fix for 7.4 + +--- + src/copy.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/copy.c b/src/copy.c +index 468232c..c2be302 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -127,7 +127,9 @@ static inline zend_op* uopz_copy_opcodes(zend_op_array *op_array, zval *literals + case ZEND_JMP: + case ZEND_FAST_CALL: + case ZEND_DECLARE_ANON_CLASS: ++#if PHP_VERSION_ID < 70400 + case ZEND_DECLARE_ANON_INHERITED_CLASS: ++#endif + opline->op1.jmp_addr = ©[opline->op1.jmp_addr - op_array->opcodes]; + break; + |