wharmby Fri Jan 23 23:49:32 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams
stream_get_meta_data_socket_variation1.phpt
stream_get_meta_data_socket_variation2.phpt
stream_get_meta_data_socket_variation3.phpt
stream_get_meta_data_socket_variation4.phpt
Log:
Make test more robust; avoid hangs if fsockopen() fails. Tested on Windows,
Linux and Linux 64 bit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index:
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
diff -u
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.4.4
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.4.5
---
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt:1.1.4.4
Thu Mar 20 12:14:15 2008
+++
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
Fri Jan 23 23:49:31 2009
@@ -8,6 +8,9 @@
/* 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);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index:
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
diff -u
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.4.4
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.4.5
---
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt:1.1.4.4
Thu Mar 20 12:14:15 2008
+++
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
Fri Jan 23 23:49:31 2009
@@ -8,6 +8,9 @@
/* 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);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index:
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
diff -u
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.4.4
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.4.5
---
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt:1.1.4.4
Thu Mar 20 12:14:15 2008
+++
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
Fri Jan 23 23:49:31 2009
@@ -8,6 +8,9 @@
/* 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);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index:
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
diff -u
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.4.3
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.4.4
---
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt:1.1.4.3
Thu Mar 20 11:34:50 2008
+++
php-src/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
Fri Jan 23 23:49:31 2009
@@ -8,6 +8,9 @@
/* 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
