]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sun, 3 Jul 2016 15:57:42 +0000 (23:57 +0800)
committerXinchen Hui <laruence@gmail.com>
Sun, 3 Jul 2016 15:57:42 +0000 (23:57 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  update NEWS
  extend test
  Fixed bug #72534 stream_socket_get_name crashes


Trivial merge