From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Sat, 2 Feb 2013 14:31:44 +0000 (+0100)
Subject: Merge branch 'sockets_54_improv' into PHP-5.4
X-Git-Tag: php-5.5.0alpha5~43^2~13^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73de4d8c689ff5c82373a4837dc8a21c9902a8b2;p=php

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
---

73de4d8c689ff5c82373a4837dc8a21c9902a8b2