]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cea9e6 ac6342b)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.