]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b2c411 f082d63)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatol Belski <ab@php.net>
Mon, 22 Apr 2013 16:59:11 +0000 (18:59 +0200)
committerAnatol Belski <ab@php.net>
Mon, 22 Apr 2013 16:59:11 +0000 (18:59 +0200)
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and

1  2 
ext/standard/streamsfuncs.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/streamsfuncs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.