Patch 61635.diff for Sockets related Bug #61635

Patch version 2012-04-05 14:24 UTC

• 2012-04-05 14:24 UTC [diff to current]

Developer: ab@php.net

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;
--- a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt	Thu Apr  5 16:19:17 2012
+++ b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt	Thu Apr  5 16:19:17 2012
@@ -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, till@php.net
+Berlin TestFest 2009