]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44fdae4 cda7dcf)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 25 Apr 2017 10:59:22 +0000 (12:59 +0200)
committerAnatol Belski <ab@php.net>
Tue, 25 Apr 2017 10:59:22 +0000 (12:59 +0200)
* PHP-7.0:
  Follow up patch regarding bug #74216, see bug #74429

1  2 
main/streams/xp_socket.c patch | diff1 | diff2 | blob | history

diff --cc main/streams/xp_socket.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.