]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 27 Apr 2016 04:51:51 +0000 (12:51 +0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 27 Apr 2016 04:51:51 +0000 (12:51 +0800)
* PHP-7.0:
  Use zend_string_safe_alloc

1  2 
ext/standard/string.c

Simple merge