granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3006d1d 868930e)

author	Sara Golemon <pollita@php.net>
	Wed, 1 Mar 2017 01:17:41 +0000 (17:17 -0800)
committer	Sara Golemon <pollita@php.net>
	Wed, 1 Mar 2017 01:17:41 +0000 (17:17 -0800)
commit	c5727a30cfdfec90af3614244216b9f1959f2125
tree	0df29089df54e551072a65c7ff26d9824df97be2	tree \| snapshot
parent	3006d1de5b1b2903af3ad1e8c72c3cfe6cd1af15	commit \| diff
parent	868930e0794e0ad49a95d6add5e3c7eac8743455	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix potential crash when setting invalid declare value

Zend/zend_compile.c

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