From: andy wharmby Date: Fri, 23 Jan 2009 23:49:31 +0000 (+0000) Subject: Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows, Linux... X-Git-Tag: php-5.2.9RC1~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ce15a6cc372ebd480e19a498f57f40b361729dd;p=php Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows, Linux and Linux 64 bit --- diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt index 6493110394..16b38d9a1b 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt @@ -8,6 +8,9 @@ $server = stream_socket_server('tcp://127.0.0.1:31337'); /* Connect to it */ $client = fsockopen('tcp://127.0.0.1:31337'); +if (!$client) { + die("Unable to create socket"); +} /* Accept that connection */ $socket = stream_socket_accept($server); diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt index c04f3cb5de..d30fec7056 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt @@ -8,6 +8,9 @@ $server = stream_socket_server('tcp://127.0.0.1:31337'); /* Connect to it */ $client = fsockopen('tcp://127.0.0.1:31337'); +if (!$client) { + die("Unable to create socket"); +} /* Accept that connection */ $socket = stream_socket_accept($server); diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt index 4ec00b3fd6..0b079ccf7c 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt @@ -8,6 +8,9 @@ $server = stream_socket_server('tcp://127.0.0.1:31337'); /* Connect to it */ $client = fsockopen('tcp://127.0.0.1:31337'); +if (!$client) { + die("Unable to create socket"); +} /* Accept that connection */ $socket = stream_socket_accept($server); diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt index dae4f470fc..f9ef747987 100644 --- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt +++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt @@ -8,6 +8,9 @@ $server = stream_socket_server('tcp://127.0.0.1:31337'); /* Connect to it */ $client = fsockopen('tcp://127.0.0.1:31337'); +if (!$client) { + die("Unable to create socket"); +} /* Accept that connection */ $socket = stream_socket_accept($server);