com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS main/network.c
| From: | Joe Watkins | Date: | Tue, 04 Sep 2018 09:12:39 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: NEWS main/network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102992@lists.php.net to get a copy of this message | ||
Commit: 21f8cd2a92fc105a0a782e35658389d0dc33a0c9
Author: Joe Watkins <krakjoe@php.net> Tue, 4 Sep 2018 11:12:26 +0200
Parents: 64d2978546721cf7b1c3723e28cad89e1631570e 0f724453c03b7ff500563c019f5dab736d326ad8
Branches: PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=21f8cd2a92fc105a0a782e35658389d0dc33a0c9
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #74764 and add a test case
Bugs:
https://bugs.php.net/74764
Changed paths:
MM NEWS
MM main/network.c
Diff:
diff --cc NEWS
index ea2cf4e,ea1fd8e..8526be9
--- a/NEWS
+++ b/NEWS
@@@ -12,8 -12,10 +12,10 @@@ PH
- Standard:
. Fixed bug #73457 (Wrong error message when fopen FTP wrapped fails to open
data connection).. (Ville Hukkamäki)
+ . Fixed bug #74764 (Bindto IPv6 works with file_get_contents but fails with
+ stream_socket_client). (Ville Hukkamäki)
-13 Sep 2018, PHP 7.1.22
+13 Sep 2018, PHP 7.2.10
- Core:
. Fixed bug #76754 (parent private constant in extends class memory leak).