diff options
author | Anatol Belski <ab@php.net> | 2017-04-27 11:11:41 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-04-27 11:11:41 +0200 |
commit | 392bcba58d76fb497c0d0fccca97ee809a237871 (patch) | |
tree | dd089fc1b10d2e3ee34d0062c35787b6b05ab566 /ext/intl/php_intl.c | |
parent | 66dbeb81bae7b35af1596229fe89d4a0d7dbbce8 (diff) | |
parent | 09ef61e3ca33d8f91b188cd0ad2512987671962b (diff) | |
download | php-git-392bcba58d76fb497c0d0fccca97ee809a237871.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* 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 'ext/intl/php_intl.c')
0 files changed, 0 insertions, 0 deletions