Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows, Linux...

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 649311039497997a5fbc5e530f9cd2bdceb0d232..16b38d9a1bb832b758f98453c526403c4a02dd57 100644 (file)
--- 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 c04f3cb5de9eab2507a29217139c77007e0b537b..d30fec7056ae7b7269c7c4fde4f025797f254c87 100644 (file)
--- 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 4ec00b3fd6802ac286c4bb494a67a4e0a94cea83..0b079ccf7c4a05745da934e7b82a961ab8f76c4f 100644 (file)
--- 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 dae4f470fcbb4173d0081157c307247d536f7ca1..f9ef747987331cd8d24275ebc32b32d456121e51 100644 (file)
--- 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);