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

Merge branch 'PHP-5.4' into PHP-5.5

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

e8f0e863ae48d58d2bb95e667606d7846f782d08