]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Tue, 25 Apr 2017 11:00:10 +0000 (13:00 +0200)
committerAnatol Belski <ab@php.net>
Tue, 25 Apr 2017 11:00:10 +0000 (13:00 +0200)
* PHP-7.1:
  Follow up patch regarding bug #74216, see bug #74429

1  2 
main/streams/xp_socket.c

Simple merge