]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 27 Apr 2017 09:13:00 +0000 (11:13 +0200)
committerAnatol Belski <ab@php.net>
Thu, 27 Apr 2017 09:13:00 +0000 (11:13 +0200)
* PHP-7.1:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"

1  2 
main/streams/xp_socket.c

Simple merge