granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e6bc4f3 368958b)

author	Anatol Belski <ab@php.net>
	Mon, 30 Jan 2017 11:46:11 +0000 (12:46 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 30 Jan 2017 11:46:11 +0000 (12:46 +0100)
commit	de64adeb1ddd49fc763a3941792a701fef1a8132
tree	30dccba7d5d1dabf4100b3a1f45ffd3905e851fa	tree \| snapshot
parent	e6bc4f39a27c8a91df48cf9ab2de76eb1b7c81c0	commit \| diff
parent	368958b3e4ad341da02c901bfd58296d55d91605	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73983 crash on finish work with phar in cli + opcache

ext/opcache/zend_persist.c

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