- killed off UEXPECT

- no getmxrr() under doze

diff --git a/ext/standard/tests/network/getmxrr.phpt b/ext/standard/tests/network/getmxrr.phpt
index 531001b553b89ea3c22b6ca58bfdc1ad5cad5a5f..0407b093b4f236342240c8640df08c1edc793f4b 100644 (file)
--- a/ext/standard/tests/network/getmxrr.phpt
+++ b/ext/standard/tests/network/getmxrr.phpt
@@ -1,5 +1,11 @@
 --TEST--
 dns_check_record() segfault with empty host
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip No windows support');
+}
+?>
 --FILE--
 <?php
 $domains = array( 'php.net', 'ez.no' );

diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt
index e70caf98232550aabdfec53a066702a83ac4d927..092753e255b7005e60e645d745044c22529be9e8 100644 (file)
--- a/ext/standard/tests/network/http-stream.phpt
+++ b/ext/standard/tests/network/http-stream.phpt
@@ -10,5 +10,5 @@ $d = new DomDocument;
 $e = $d->load("http://php.net/news.rss");
 echo "ALIVE\n";
 ?>
---EXPECTF--
+--EXPECT--
 ALIVE

diff --git a/ext/standard/tests/network/inet.phpt b/ext/standard/tests/network/inet.phpt
index 434ca13422f124f161fb327a7365960ed95ff4e8..d4d32fa50aa48c1a621854ece492c640af3e6fe2 100644 (file)
--- a/ext/standard/tests/network/inet.phpt
+++ b/ext/standard/tests/network/inet.phpt
@@ -37,43 +37,7 @@ foreach ($array as $val) {
 
 echo "Done\n";
 ?>
---EXPECTF--    
-string(9) "127.0.0.1"
-string(13) "255.255.255.0"
-
-Warning: inet_ntop() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
-
-Warning: inet_ntop(): Invalid in_addr value in %s on line %d
-bool(false)
-
-Warning: inet_ntop(): Invalid in_addr value in %s on line %d
-bool(false)
-
-Warning: inet_ntop(): Invalid in_addr value in %s on line %d
-bool(false)
-
-Warning: inet_pton() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
-
-Warning: inet_pton(): Unrecognized address  in %s on line %d
-bool(false)
-
-Warning: inet_pton(): Unrecognized address -1 in %s on line %d
-bool(false)
-
-Warning: inet_pton(): Unrecognized address abra in %s on line %d
-bool(false)
-string(4) "%s"
-string(9) "127.0.0.1"
-string(4) "%s"
-string(14) "66.163.161.116"
-string(4) "%s"
-string(15) "255.255.255.255"
-string(4) "%s"
-string(7) "0.0.0.0"
-Done
---UEXPECTF--
+--EXPECTF--
 unicode(9) "127.0.0.1"
 unicode(13) "255.255.255.0"
 

diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt
index 125bd15fb3bc288052f02ce3293cb0f650099b53..573d2125556abc671f8b0e0a02ed7e44cd3c59aa 100644 (file)
--- a/ext/standard/tests/network/inet_ipv6.phpt
+++ b/ext/standard/tests/network/inet_ipv6.phpt
@@ -33,22 +33,7 @@ foreach ($a as $address) {
 
 echo "Done\n";
 ?>
---EXPECTF--    
-string(3) "::1"
-string(3) "::2"
-string(4) "::35"
-string(5) "::255"
-string(6) "::1024"
-
-Warning: inet_pton(): Unrecognized address  in %s on line %d
-
-Warning: inet_ntop(): Invalid in_addr value in %s on line %d
-bool(false)
-string(36) "2001:db8:85a3:8d3:1319:8a2e:370:7344"
-string(15) "2001:db8:1234::"
-string(38) "2001:db8:1234:ffff:ffff:ffff:ffff:ffff"
-Done
---UEXPECTF--
+--EXPECTF--
 unicode(3) "::1"
 unicode(3) "::2"
 unicode(4) "::35"

diff --git a/ext/standard/tests/network/ip.phpt b/ext/standard/tests/network/ip.phpt
index 27fc0837237be9cb92aa6e029535fdfa07d3e54c..813d9662600af3254cd77bb461b0c7b04b0f2696 100644 (file)
--- a/ext/standard/tests/network/ip.phpt
+++ b/ext/standard/tests/network/ip.phpt
@@ -35,38 +35,7 @@ var_dump(long2ip(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-int(2130706433)
-string(9) "127.0.0.1"
-int(167772161)
-string(8) "10.0.0.1"
-int(-1)
-string(15) "255.255.255.255"
-int(-256)
-string(13) "255.255.255.0"
-int(0)
-string(7) "0.0.0.0"
-int(1118019956)
-string(14) "66.163.161.116"
-
-Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-int(1869573999)
-
-Warning: ip2long() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
-Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-string(13) "255.254.82.80"
-string(7) "0.0.0.0"
-
-Warning: long2ip() expects parameter 1 to be string, array given in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 int(2130706433)
 unicode(9) "127.0.0.1"
 int(167772161)

diff --git a/ext/standard/tests/network/ip_x86_64.phpt b/ext/standard/tests/network/ip_x86_64.phpt
index 23bbc931ea7b846e84cd7d3a8aee19ef64023563..355f97d4e241ed53458bf0b65304dfbdda9e6281 100644 (file)
--- a/ext/standard/tests/network/ip_x86_64.phpt
+++ b/ext/standard/tests/network/ip_x86_64.phpt
@@ -34,38 +34,7 @@ var_dump(long2ip(array()));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-int(2130706433)
-string(9) "127.0.0.1"
-int(167772161)
-string(8) "10.0.0.1"
-int(4294967295)
-string(15) "255.255.255.255"
-int(4294967040)
-string(13) "255.255.255.0"
-int(0)
-string(7) "0.0.0.0"
-int(1118019956)
-string(14) "66.163.161.116"
-
-Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-bool(false)
-bool(false)
-int(1869573999)
-
-Warning: ip2long() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
-Warning: long2ip() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-string(13) "255.254.82.80"
-string(7) "0.0.0.0"
-
-Warning: long2ip() expects parameter 1 to be string, array given in %s on line %d
-NULL
-Done
---UEXPECTF--   
+--EXPECTF--
 int(2130706433)
 unicode(9) "127.0.0.1"
 int(167772161)