]> granicus.if.org Git - php/commit
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)
commitc667bb94fa7e1ca52bfaea2b372794f96269e03a
treeb1d612052d74e221a3db0d1b0f2addbbbac44660
parent7d418430fdfe893eae11cf3c1843d2f5b0574068
parent8a1713e39cf31f5c13839c8a6aeb784e365e1cd1
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
main/php_ini.c