diff options
| author | Anatol Belski <ab@php.net> | 2017-04-27 11:11:41 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-04-27 21:52:47 +0100 |
| commit | ee9650c3d2b0ccc9bdeec3de33ad1950b8362005 (patch) | |
| tree | eb3708baebd071a4ab0004bd6d9402dc4a53a2d8 /Zend | |
| parent | 4951d16dba3b04657f09e6a804efd6b91cc9a187 (diff) | |
| download | php-git-php-7.1.5RC1.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1php-7.1.5RC1
* PHP-7.0:
Revert "Detect invalid port in xp_socket parse ip address"
Revert "Follow up patch regarding bug #74216, see bug #74429"
Diffstat (limited to 'Zend')
0 files changed, 0 insertions, 0 deletions