]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 22 Nov 2016 01:30:16 +0000 (02:30 +0100)
committerAnatol Belski <ab@php.net>
Tue, 22 Nov 2016 01:30:16 +0000 (02:30 +0100)
* PHP-7.0:
  fix invalid read, follow up on 97b65cc9

1  2 
Zend/zend_ini_parser.y

Simple merge