summaryrefslogtreecommitdiff
path: root/Zend/zend_opcode.c
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-01-12 15:19:39 +0100
committerJulien Pauli <jpauli@php.net>2016-01-12 15:19:39 +0100
commit65e592e4770c0dba275fc3a600cc59fa09a0d878 (patch)
treeb48e4f4d97171d52993234a967f9e35c7f294176 /Zend/zend_opcode.c
parentad57a71aa43e6ad94a89758c76741b72104f6d6b (diff)
parentbec0aec11691fa712750206d1b2cdd34bf6fc5a5 (diff)
downloadphp-git-65e592e4770c0dba275fc3a600cc59fa09a0d878.tar.gz
Merge branch 'PHP-7.0'
* PHP-7.0: Trigger op_array_handler() if HAVE_OP_ARRAY_HANDLER is set
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r--Zend/zend_opcode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 9f5afcebe6..cff294854c 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -609,7 +609,7 @@ ZEND_API int pass_two(zend_op_array *op_array)
zend_update_extended_info(op_array);
}
if (CG(compiler_options) & ZEND_COMPILE_HANDLE_OP_ARRAY) {
- if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_PERSIST) {
+ if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_HANDLER) {
zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_handler, op_array);
}
}