From: Sara Golemon <pollita@php.net>
Date: Sun, 28 May 2017 15:49:25 +0000 (-0700)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e628ee9e9db1e7fc471159ab2479a8bfd85e122d;p=php

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
---

e628ee9e9db1e7fc471159ab2479a8bfd85e122d
diff --cc NEWS
index 76599d7f5e,3c768adad1..2be3331ee1
--- a/NEWS
+++ b/NEWS
@@@ -17,7 -18,10 +18,10 @@@ PH
  - FTP:
    . Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara)
  
+ - Streams:
+   . Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara)
+ 
 -8 Jun 2017 PHP 7.0.20
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).