]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Sat, 10 Mar 2018 10:20:11 +0000 (11:20 +0100)
committerAnatol Belski <ab@php.net>
Sat, 10 Mar 2018 10:20:11 +0000 (11:20 +0100)
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault

1  2 
Zend/zend_ini_parser.y

Simple merge