granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d46d53a e88e83d)

author	Sara Golemon <pollita@php.net>
	Tue, 23 Jan 2018 14:24:40 +0000 (09:24 -0500)
committer	Sara Golemon <pollita@php.net>
	Tue, 23 Jan 2018 14:24:40 +0000 (09:24 -0500)
commit	e954bafc285e97cbdb9718b4cf2de77feaed3771
tree	7ed08955204be594d288e5ff888e7e065eb03ec7	tree \| snapshot
parent	d46d53a7bcc99bb8d993852ef84e7a83d703f3db	commit \| diff
parent	e88e83d3e5c33fcd76f08b23e1a2e4e8dc98ce41	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop

Zend/zend_API.h

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