Commit:    e8f0e863ae48d58d2bb95e667606d7846f782d08
Author:    Gustavo Lopes <glo...@nebm.ist.utl.pt>         Sat, 2 Feb 2013 
15:32:03 +0100
Parents:   114245c1b9cf153583c918e130faccc1f61d3ba5 
73de4d8c689ff5c82373a4837dc8a21c9902a8b2
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=e8f0e863ae48d58d2bb95e667606d7846f782d08

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

Changed paths:
  MM  ext/sockets/sockets.c
  MM  main/network.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to