Fix tests (Windows)

3 files changed, 65 insertions, 3 deletions

diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index e2fc523ce5..b36764f617 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -80,9 +80,6 @@ stream_set_blocking
 Warning: stream_set_blocking(): %d is not a valid stream resource in %s on line %d
 
 socket_set_block 
-Warning: socket_set_block(): An operation was attempted on something that is not a socket.
- in %ssocket_import_stream-4-win.php on line %d
-
 Warning: socket_set_block(): unable to set blocking mode [%d]: An operation was attempted on something that is not a socket.
  in %ssocket_import_stream-4-win.php on line %d
 
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
new file mode 100644
index 0000000000..ec965094bc
--- /dev/null
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
@@ -0,0 +1,62 @@
+--TEST--
+Test if socket_recvfrom() receives data sent by socket_sendto() via IPv6 UDP (Win32)
+--SKIPIF--
+<?php
+if (!extension_loaded('sockets')) {
+    die('SKIP The sockets extension is not loaded.');
+}
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+	die('skip only for Windows');
+}
+require 'ipv6_skipif.inc';
+--FILE--
+<?php
+    $socket = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
+    if (!$socket) {
+        die('Unable to create AF_INET6 socket');
+    }
+    if (!socket_set_nonblock($socket)) {
+        die('Unable to set nonblocking mode for socket');
+    }
+    socket_recvfrom($socket, $buf, 12, 0, $from, $port); // cause warning
+    $address = '::1';
+    socket_sendto($socket, '', 1, 0, $address); // cause warning
+    if (!socket_bind($socket, $address, 1223)) {
+        die("Unable to bind to $address:1223");
+    }
+
+    $msg = "Ping!";
+    $len = strlen($msg);
+    $bytes_sent = socket_sendto($socket, $msg, $len, 0, $address, 1223);
+    if ($bytes_sent == -1) {
+        die('An error occurred while sending to the socket');
+    } else if ($bytes_sent != $len) {
+        die($bytes_sent . ' bytes have been sent instead of the ' . $len . ' bytes expected');
+    }
+
+    $from = "";
+    $port = 0;
+    socket_recvfrom($socket, $buf, 12, 0); // cause warning
+    socket_recvfrom($socket, $buf, 12, 0, $from); // cause warning
+    $bytes_received = socket_recvfrom($socket, $buf, 12, 0, $from, $port);
+    if ($bytes_received == -1) {
+        die('An error occurred while receiving from the socket');
+    } else if ($bytes_received != $len) {
+        die($bytes_received . ' bytes have been received instead of the ' . $len . ' bytes expected');
+    }
+    echo "Received $buf from remote address $from and remote port $port" . PHP_EOL;
+
+    socket_close($socket);
+--EXPECTF--
+Warning: socket_recvfrom(): unable to recvfrom [10022]: An invalid argument was supplied.
+ in %s on line %d
+
+Warning: Wrong parameter count for socket_sendto() in %s on line %d
+
+Warning: socket_recvfrom() expects at least 5 parameters, 4 given in %s on line %d
+
+Warning: Wrong parameter count for socket_recvfrom() in %s on line %d
+Received Ping! from remote address ::1 and remote port 1223
+--CREDITS--
+Falko Menge <mail at falko-menge dot de>
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
index 04f62eddd3..2beb8080cd 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -5,6 +5,9 @@ Test if socket_recvfrom() receives data sent by socket_sendto() via IPv6 UDP
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
 }
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	die('skip Not valid for Windows');
+}
 require 'ipv6_skipif.inc';
 --FILE--
 <?php