]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 114245c 73de4d8)
Merge branch 'PHP-5.4' into PHP-5.5
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 14:32:03 +0000 (15:32 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 14:32:03 +0000 (15:32 +0100)
* PHP-5.4:
  Fix wrong blocking state being set
  Fix tests (Windows)
  Remove a Windows only warning
  Move & improve PHP_SOCKET_ERROR def
  Move some declarations to sockets.c
  Fix overbroad skipif include

1  2 
ext/sockets/sockets.c patch | diff1 | diff2 | blob | history
main/network.c patch | diff1 | diff2 | blob | history

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