- Fixed tests in ext/standard/tests/http by adding the INI setting value

  allow_url_fopen=1
- Converted test file from dos line endings to unix line endings.

diff --git a/ext/standard/tests/http/bug38802.phpt b/ext/standard/tests/http/bug38802.phpt
index 91fd1cce9d5a925a3c1ca5090e4d60fdc8b65367..73b41183ae9db1260afe4b1ec46c0348be749a0a 100644 (file)
--- a/ext/standard/tests/http/bug38802.phpt
+++ b/ext/standard/tests/http/bug38802.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #38802 (ignore_errors and max_redirects)
+--INI--
+allow_url_fopen=1
 --SKIPIF--
 <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
 --FILE--

diff --git a/ext/standard/tests/http/bug43510.phpt b/ext/standard/tests/http/bug43510.phpt
index 7358ee12c7ad45380c29e1cce93b873b6828c3aa..d9736123720699a8e7a46605452c1733b0a5482a 100644 (file)
--- a/ext/standard/tests/http/bug43510.phpt
+++ b/ext/standard/tests/http/bug43510.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #43510 (stream_get_meta_data() does not return same mode as used in fopen)
+--INI--
+allow_url_fopen=1
 --SKIPIF--
 <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
 --FILE--

diff --git a/ext/standard/tests/http/bug48929.phpt b/ext/standard/tests/http/bug48929.phpt
index 035ebb12b1f90e5a63acc79becf2ba82b9ee5658..2d1e45917a218cad824c5801ef092c6aa7aa8fdd 100644 (file)
--- a/ext/standard/tests/http/bug48929.phpt
+++ b/ext/standard/tests/http/bug48929.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #48929 (duplicate \r\n sent after last header line)
+--INI--
+allow_url_fopen=1
 --SKIPIF--
 <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
 --FILE--

diff --git a/ext/standard/tests/http/bug53198.phpt b/ext/standard/tests/http/bug53198.phpt
index fe26bc9523ed9c8c6622c8a51a58e650ac38ce79..3c640fa9c8234f0430a100ab4603d08a80c660e8 100644 (file)
--- a/ext/standard/tests/http/bug53198.phpt
+++ b/ext/standard/tests/http/bug53198.phpt
@@ -1,56 +1,57 @@
---TEST--\r
-Bug #53198 (From: header cannot be changed with ini_set)\r
---SKIPIF--\r
-<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>\r
---INI--\r
-from=teste@teste.pt\r
---FILE--\r
-<?php\r
-require 'server.inc';\r
-\r
-function do_test() {\r
-\r
-       $responses = array(\r
-               "data://text/plain,HTTP/1.0 200 OK\r\n\r\n",\r
-       );\r
-\r
-       $pid = http_server("tcp://127.0.0.1:12342", $responses, $output);\r
-\r
-       foreach($responses as $r) {\r
-\r
-               $fd = fopen('http://127.0.0.1:12342/', 'rb', false);\r
-\r
-               fseek($output, 0, SEEK_SET);\r
-               var_dump(stream_get_contents($output));\r
-               fseek($output, 0, SEEK_SET);\r
-       }\r
-\r
-       http_server_kill($pid);\r
-\r
-}\r
-\r
-echo "-- Test: leave default --\n";\r
-\r
-do_test();\r
-\r
-echo "-- Test: after ini_set --\n";\r
-\r
-ini_set('from', 'junk@junk.com');\r
-\r
-do_test();\r
-\r
-?>\r
---EXPECT--\r
--- Test: leave default --\r
-string(63) "GET / HTTP/1.0\r
-From: teste@teste.pt\r
-Host: 127.0.0.1:12342\r
-\r
-"\r
--- Test: after ini_set --\r
-string(62) "GET / HTTP/1.0\r
-From: junk@junk.com\r
-Host: 127.0.0.1:12342\r
-\r
-"\r
-\r
+--TEST--
+Bug #53198 (From: header cannot be changed with ini_set)
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--INI--
+allow_url_fopen=1
+from=teste@teste.pt
+--FILE--
+<?php
+require 'server.inc';
+
+function do_test() {
+
+       $responses = array(
+               "data://text/plain,HTTP/1.0 200 OK\r\n\r\n",
+       );
+
+       $pid = http_server("tcp://127.0.0.1:12342", $responses, $output);
+
+       foreach($responses as $r) {
+
+               $fd = fopen('http://127.0.0.1:12342/', 'rb', false);
+
+               fseek($output, 0, SEEK_SET);
+               var_dump(stream_get_contents($output));
+               fseek($output, 0, SEEK_SET);
+       }
+
+       http_server_kill($pid);
+
+}
+
+echo "-- Test: leave default --\n";
+
+do_test();
+
+echo "-- Test: after ini_set --\n";
+
+ini_set('from', 'junk@junk.com');
+
+do_test();
+
+?>
+--EXPECT--
+-- Test: leave default --
+string(63) "GET / HTTP/1.0
+From: teste@teste.pt
+Host: 127.0.0.1:12342
+
+"
+-- Test: after ini_set --
+string(62) "GET / HTTP/1.0
+From: junk@junk.com
+Host: 127.0.0.1:12342
+
+"
+

diff --git a/ext/standard/tests/http/ignore_errors.phpt b/ext/standard/tests/http/ignore_errors.phpt
index c7e1acbfe7415c1a7a534a23ffb265c8dd32cca4..ab5421890bccf3190a61957a4f660a66496b1bba 100644 (file)
--- a/ext/standard/tests/http/ignore_errors.phpt
+++ b/ext/standard/tests/http/ignore_errors.phpt
@@ -1,5 +1,7 @@
 --TEST--
 http:// and ignore_errors
+--INI--
+allow_url_fopen=1
 --SKIPIF--
 <?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
 --FILE--