]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorSara Golemon <pollita@php.net>
Tue, 7 Mar 2017 20:11:22 +0000 (12:11 -0800)
committerSara Golemon <pollita@php.net>
Tue, 7 Mar 2017 20:11:22 +0000 (12:11 -0800)
* PHP-7.0:
  Detect invalid port in xp_socket parse ip address

1  2 
main/streams/xp_socket.c

Simple merge