com php-src: Fixed bug #61633 Test ext\sockets\tests\sock et_create_pair-wrongparams.phpt fails: ext/sockets/
tests/socket_create_pair-wrongparams-win32.phpt ext /sockets/tests/socket_create_pair-wrongparams.phpt
| From: | Anatoliy Belsky | Date: | Tue, 10 Apr 2012 11:02:53 +0000 |
| Subject: | com php-src: Fixed bug #61633 Test ext\sockets\tests\sock et_create_pair-wrongparams.phpt fails: ext/sockets/ tests/socket_create_pair-wrongparams-win32.phpt ext /sockets/tests/socket_create_pair-wrongparams.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68714@lists.php.net to get a copy of this message | ||
Commit: 5594fcf423d46996378d428ebe6055a6f93ced49
Author: Anatoliy Belsky <ab@php.net> Tue, 10 Apr 2012 13:02:53 +0200
Parents: 37cb29ae90b9efdde4081f783cdc56074847c0c7
Branches: PHP-5.3 PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5594fcf423d46996378d428ebe6055a6f93ced49
Log:
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Bugs:
https://bugs.php.net/61633
Changed paths:
A ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
M ext/sockets/tests/socket_create_pair-wrongparams.phpt
Diff:
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
new file mode 100644
index 0000000..de33d95
--- /dev/null
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test parameter handling in socket_create_pair()
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+ die('skip.. Not valid for non Windows');
+}
+if (!extension_loaded('sockets')) {
+ die('SKIP The sockets extension is not loaded.');
+}
+--FILE--
+<?php
+var_dump(socket_create_pair(AF_INET, null, null));
+
+$domain = 'unknown';
+var_dump(socket_create_pair($domain, SOCK_STREAM, 0, $sockets));
+
+var_dump(socket_create_pair(AF_INET, null, null, $sockets));
+
+var_dump(socket_create_pair(31337, null, null, $sockets));
+
+var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets));
+--EXPECTF--
+Warning: socket_create_pair() expects exactly 4 parameters, 3 given in %s on line %d
+NULL
+
+Warning: socket_create_pair() expects parameter 1 to be long, %unicode_string_optional% given in %s
on line %d
+NULL
+bool(true)
+
+Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming
AF_INET in %s on line %d
+bool(true)
+
+Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming
SOCK_STREAM in %s on line %d
+bool(true)
+--CREDITS--
+Till Klampaeckel, till@php.net
+Berlin TestFest 2009
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 99512bc..afca2b8 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -2,6 +2,9 @@
Test parameter handling in socket_create_pair()
--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.');
}