]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Tue, 16 May 2017 11:32:59 +0000 (19:32 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 16 May 2017 11:32:59 +0000 (19:32 +0800)
* PHP-7.0:
  Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)

1  2 
main/php_ini.c

diff --cc main/php_ini.c
Simple merge