]> granicus.if.org Git - php/commit
Merge branch 'sockets_54_improv' into PHP-5.4
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 14:31:44 +0000 (15:31 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 14:31:44 +0000 (15:31 +0100)
commit73de4d8c689ff5c82373a4837dc8a21c9902a8b2
tree9395ea09a1f97139d35cf31d0c04b6cccec87883
parent0cea9e6843384c6c0ebb52047c42b0431a4f5660
parentac6342bbc0a2a41cf2b698e37b981ce63e8b6305
Merge branch 'sockets_54_improv' into PHP-5.4

* sockets_54_improv:
  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