]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88a44b1 af147ac)
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 09:11:23 +0000 (11:11 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Apr 2014 09:11:23 +0000 (11:11 +0200)
* PHP-5.5:
  Fix bug #64330

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.