Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test with a slightly different warning in TS
This commit is contained in:
Anatoliy Belsky 2012-12-03 10:44:10 +01:00
commit 262decd35f

View File

@ -83,7 +83,7 @@ socket_set_block
Warning: socket_set_block(): An operation was attempted on something that is not a socket.
in %ssocket_import_stream-4-win.php on line %d
Warning: socket_set_block(): unable to set blocking mode [%d]: An operation was attempted on something that is not a socket.
Warning: socket_set_block(): unable to set blocking mode [%d]: %s
in %ssocket_import_stream-4-win.php on line %d
socket_get_option