]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Sun, 28 Aug 2016 16:10:57 +0000 (00:10 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 28 Aug 2016 16:10:57 +0000 (00:10 +0800)
* PHP-7.0:
  Fixed bug #72936 (Zend API's zend_symtable_str_update() asserts key should end with '\0')

1  2 
Zend/zend_hash.c

Simple merge