granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d4cb416 8417a23)

author	Anatol Belski <ab@php.net>
	Sat, 10 Mar 2018 10:20:11 +0000 (11:20 +0100)
committer	Anatol Belski <ab@php.net>
	Sat, 10 Mar 2018 10:20:11 +0000 (11:20 +0100)
commit	cf0012dad0aa72a58928e30feabc3530d4eca6bb
tree	eac2ba0a41d102b96539613fc78cd667325603ea	tree \| snapshot
parent	d4cb4168ba5eea2ed2e983cca58f076c7f492d58	commit \| diff
parent	8417a239731158b7a8585f323e2c9216cac13c85	commit \| diff

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault

Zend/zend_ini_parser.y

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