From d80e2e069cd65a9e1c3bf5796ccc8616b625ac45 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 12:47:01 +0200
Subject: [PATCH 1/6] Fixed bug 61621 Test fail in ext/standard/tests/dir

---
 ext/standard/tests/dir/dir_variation1.phpt     | 6 ++++++
 ext/standard/tests/dir/dir_variation5.phpt     | 6 ++++++
 ext/standard/tests/dir/dir_variation6.phpt     | 6 ++++++
 ext/standard/tests/dir/dir_variation8.phpt     | 6 ++++++
 ext/standard/tests/dir/dir_variation9.phpt     | 6 ++++++
 ext/standard/tests/dir/opendir_error2.phpt     | 6 ++++++
 ext/standard/tests/dir/opendir_variation1.phpt | 6 ++++++
 ext/standard/tests/dir/opendir_variation6.phpt | 6 ++++++
 ext/standard/tests/dir/scandir_error2.phpt     | 6 ++++++
 ext/standard/tests/dir/scandir_variation1.phpt | 6 ++++++
 ext/standard/tests/dir/scandir_variation6.phpt | 6 ++++++
 11 files changed, 66 insertions(+)

diff --git a/ext/standard/tests/dir/dir_variation1.phpt b/ext/standard/tests/dir/dir_variation1.phpt
index ad912c008fd..abb47195047 100644
--- a/ext/standard/tests/dir/dir_variation1.phpt
+++ b/ext/standard/tests/dir/dir_variation1.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - unexpected value for 'dir' argument
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt
index 2399c634c54..c7450eafc0e 100644
--- a/ext/standard/tests/dir/dir_variation5.phpt
+++ b/ext/standard/tests/dir/dir_variation5.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - open a file instead of directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt
index e42057ed154..71cbf1fa17e 100644
--- a/ext/standard/tests/dir/dir_variation6.phpt
+++ b/ext/standard/tests/dir/dir_variation6.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - non-existent directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt
index a0b74a3f61f..5ecf4499230 100644
--- a/ext/standard/tests/dir/dir_variation8.phpt
+++ b/ext/standard/tests/dir/dir_variation8.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - checking with wildcard characters
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt
index 22f3d5baabf..458d0b896f6 100644
--- a/ext/standard/tests/dir/dir_variation9.phpt
+++ b/ext/standard/tests/dir/dir_variation9.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test dir() function : usage variations - relative valid and invalid paths
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* 
diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt
index 0762be2ad30..1c724097b09 100644
--- a/ext/standard/tests/dir/opendir_error2.phpt
+++ b/ext/standard/tests/dir/opendir_error2.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : error conditions - Non-existent directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_variation1.phpt b/ext/standard/tests/dir/opendir_variation1.phpt
index dc10356f565..8d195e1e62a 100644
--- a/ext/standard/tests/dir/opendir_variation1.phpt
+++ b/ext/standard/tests/dir/opendir_variation1.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : usage variations - different data types as $path arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt
index 01e8225d593..f3fc0bd6df9 100644
--- a/ext/standard/tests/dir/opendir_variation6.phpt
+++ b/ext/standard/tests/dir/opendir_variation6.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test opendir() function : usage variations - Different wildcards
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : mixed opendir(string $path[, resource $context])
diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt
index 1e99a578ac6..b5bfc28c8ef 100644
--- a/ext/standard/tests/dir/scandir_error2.phpt
+++ b/ext/standard/tests/dir/scandir_error2.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : error conditions - Non-existent directory
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation1.phpt b/ext/standard/tests/dir/scandir_variation1.phpt
index 84b3565f7e0..9988ca368a0 100644
--- a/ext/standard/tests/dir/scandir_variation1.phpt
+++ b/ext/standard/tests/dir/scandir_variation1.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - different data types as $dir arg
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])
diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt
index 5cb595fe75c..754c6152908 100644
--- a/ext/standard/tests/dir/scandir_variation6.phpt
+++ b/ext/standard/tests/dir/scandir_variation6.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Test scandir() function : usage variations - Wildcards in directory path
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. Not valid for Windows');
+}
+?>
 --FILE--
 <?php
 /* Prototype  : array scandir(string $dir [, int $sorting_order [, resource $context]])

From 37cb29ae90b9efdde4081f783cdc56074847c0c7 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 12:57:10 +0200
Subject: [PATCH 2/6] Fixed bug #61632 Test
 ext\sockets\tests\socket_create_listen.phpt fails

---
 .../tests/socket_create_listen-win32.phpt     | 21 +++++++++++++++++++
 ext/sockets/tests/socket_create_listen.phpt   |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 ext/sockets/tests/socket_create_listen-win32.phpt

diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt
new file mode 100644
index 00000000000..23bf963c5f7
--- /dev/null
+++ b/ext/sockets/tests/socket_create_listen-win32.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Test if socket binds on 31338
+--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
+$sock = socket_create_listen(31338);
+socket_getsockname($sock, $addr, $port); 
+var_dump($addr, $port);
+--EXPECT--
+string(9) "127.0.0.1"
+int(31338)
+--CREDITS--
+Till Klampaeckel, till@php.net
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 440fade61d9..76f29425877 100644
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -2,6 +2,9 @@
 Test if socket binds on 31338
 --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.');
 }

From 5594fcf423d46996378d428ebe6055a6f93ced49 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 13:02:53 +0200
Subject: [PATCH 3/6] Fixed bug #61633 Test
 ext\sockets\tests\socket_create_pair-wrongparams.phpt fails

---
 .../socket_create_pair-wrongparams-win32.phpt | 38 +++++++++++++++++++
 .../tests/socket_create_pair-wrongparams.phpt |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt

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 00000000000..de33d951f34
--- /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 99512bcc3b4..afca2b899af 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.');
 }

From 83b48280c7610f60fa7941dbf955348e624b8805 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 12:57:10 +0200
Subject: [PATCH 4/6] Fixed bug #61632 Test
 ext\sockets\tests\socket_create_listen.phpt fails

---
 .../tests/socket_create_listen-win32.phpt     | 21 +++++++++++++++++++
 ext/sockets/tests/socket_create_listen.phpt   |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 ext/sockets/tests/socket_create_listen-win32.phpt

diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt
new file mode 100644
index 00000000000..23bf963c5f7
--- /dev/null
+++ b/ext/sockets/tests/socket_create_listen-win32.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Test if socket binds on 31338
+--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
+$sock = socket_create_listen(31338);
+socket_getsockname($sock, $addr, $port); 
+var_dump($addr, $port);
+--EXPECT--
+string(9) "127.0.0.1"
+int(31338)
+--CREDITS--
+Till Klampaeckel, till@php.net
+PHP Testfest Berlin 2009-05-09
diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 440fade61d9..76f29425877 100644
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -2,6 +2,9 @@
 Test if socket binds on 31338
 --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.');
 }

From 5b0e7203e659cb3866505e4c52812b5eba040e35 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 13:02:53 +0200
Subject: [PATCH 5/6] Fixed bug #61633 Test
 ext\sockets\tests\socket_create_pair-wrongparams.phpt fails

---
 .../socket_create_pair-wrongparams-win32.phpt | 38 +++++++++++++++++++
 .../tests/socket_create_pair-wrongparams.phpt |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt

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 00000000000..de33d951f34
--- /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 99512bcc3b4..afca2b899af 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.');
 }

From c4676ee99f5381de502cd6544a9c42a25b53b933 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Tue, 10 Apr 2012 13:08:57 +0200
Subject: [PATCH 6/6] Fixed bug #61634 Test
 ext\sockets\tests\socket_listen-wrongparams.phpt fails

---
 ext/sockets/tests/socket_listen-wrongparams.phpt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt
index 7dd0d15921f..b5e13548eb9 100644
--- a/ext/sockets/tests/socket_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_listen-wrongparams.phpt
@@ -2,6 +2,9 @@
 Test parameter handling in socket_listen().
 --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.');
 }