]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorSara Golemon <pollita@php.net>
Sun, 28 May 2017 15:49:25 +0000 (08:49 -0700)
committerSara Golemon <pollita@php.net>
Sun, 28 May 2017 15:49:25 +0000 (08:49 -0700)
commite628ee9e9db1e7fc471159ab2479a8bfd85e122d
tree2c31157b4ca44c9229e3a049fe754d7cc56ec36f
parentd9458aac9d3f932e9b0da4d099d645d7e74ac4e2
parent8dcfec9789b4792f7b6b25673274b74bae71b512
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe
NEWS
ext/standard/streamsfuncs.c
main/network.c