Commit:    70f2f30e67536b388817a4a3a88409f9eef24f94
Author:    Anatoliy Belsky <a...@php.net>         Tue, 10 Apr 2012 13:40:20 
+0200
Parents:   006b04da4a8a242c971b9641748323065d539069
Branches:  PHP-5.4 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=70f2f30e67536b388817a4a3a88409f9eef24f94

Log:
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

Bugs:
https://bugs.php.net/61635

Changed paths:
  A  ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
  M  ext/sockets/tests/socket_select-wrongparams-1.phpt


Diff:
diff --git a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt 
b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
new file mode 100644
index 0000000..34d46d6
--- /dev/null
+++ b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Test parameter handling in socket_select().
+--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
+$sockets = array();
+$domain = AF_INET;
+socket_create_pair($domain, SOCK_STREAM, 0, $sockets);
+
+$write  = null;
+$except = null;
+$time   = -1;
+var_dump(socket_select($sockets, $write, $except, $time));
+--EXPECTF--
+int(0)
+--CREDITS--
+Till Klampaeckel, t...@php.net
+Berlin TestFest 2009
diff --git a/ext/sockets/tests/socket_select-wrongparams-1.phpt 
b/ext/sockets/tests/socket_select-wrongparams-1.phpt
index e786bc2..848088f 100644
--- a/ext/sockets/tests/socket_select-wrongparams-1.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-1.phpt
@@ -2,17 +2,16 @@
 Test parameter handling in socket_select().
 --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.');
 }
 --FILE--
 <?php
 $sockets = array();
-if (strtolower(substr(PHP_OS, 0, 3)) == 'win') {
-    $domain = AF_INET;
-} else {
-    $domain = AF_UNIX;
-}
+$domain = AF_UNIX;
 socket_create_pair($domain, SOCK_STREAM, 0, $sockets);
 
 $write  = null;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to