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


Trivial merge