diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-10 11:09:48 (GMT) |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-10 11:09:48 (GMT) |
| commit | 006b04da4a8a242c971b9641748323065d539069 (patch) | |
| tree | 2ed4004547d7e30dfcbab471348c4352f6b32ec0 | |
| parent | 5b0e7203e659cb3866505e4c52812b5eba040e35 (diff) | |
| parent | c4676ee99f5381de502cd6544a9c42a25b53b933 (diff) | |
| download | php-006b04da4a8a242c971b9641748323065d539069.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
Fixed bug 61621 Test fail in ext/standard/tests/dir
| -rw-r--r-- | ext/sockets/tests/socket_listen-wrongparams.phpt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt index 7dd0d15..b5e1354 100644 --- a/ext/sockets/tests/socket_listen-wrongparams.phpt +++ b/ext/sockets/tests/socket_listen-wrongparams.phpt @@ -2,6 +2,9 @@ Test parameter handling in socket_listen(). --SKIPIF-- <?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip.. Not valid for Windows'); +} if (!extension_loaded('sockets')) { die('SKIP The sockets extension is not loaded.'); } |