granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

author	Dmitry Stogov <dmitry@zend.com>
	Wed, 23 Jul 2014 21:54:21 +0000 (01:54 +0400)
committer	Dmitry Stogov <dmitry@zend.com>
	Wed, 23 Jul 2014 21:54:21 +0000 (01:54 +0400)
commit	7c6477ce37974f5d41cbbf245c27a2d0e6df1f6a
tree	eb2c417726ae631e60fd04a4ed23719cb2358c2c	tree \| snapshot
parent	9583a14e7586a78b3756996e67c9590989a691f2	commit \| diff
parent	8fb7c4dc08c9d4eeb891be47b63b5b717bb61c45	commit \| diff

Merge branch 'master' into phpng

* master:
  Removed second zval_copy_ctor()
  Fixed crash on self-referencing constant expression (part of a constant AST)
  Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)

Conflicts:
Zend/zend_ast.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/reflection/php_reflection.c

Zend/zend_ast.c	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Zend/zend_ast.c	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	diff1 \|	diff2 \|	blob \| history