Merge branch 'v2.6.x'

[m6w6/ext-http] / tests / url001.phpt

diff --git a/tests/url001.phpt b/tests/url001.phpt
index 6519ddfcb4900bd8ee21661fdb2294e40c655ff5..647c7a529ab6a8d3bf9f98c4f49d18783b1a470a 100644 (file)
--- a/tests/url001.phpt
+++ b/tests/url001.phpt
@@ -1,7 +1,9 @@
 --TEST--
 url from env
 --SKIPIF--
-<? include "skippif.inc"; ?>
+<?php
+include "skipif.inc";
+?>
 --ENV--
 SERVER_PORT=55555
 HTTP_HOST=example.com
@@ -9,11 +11,12 @@ HTTP_HOST=example.com
 s=b&i=0&e=&a[]=1&a[]=2
 --FILE--
 <?php
-printf("%s\n", new http\Url);
-printf("%s\n", new http\Url("other", "index"));
-printf("%s\n", new http\Url(array("scheme" => "https", "port" => 443)));
-printf("%s\n", new http\Url(array("path" => "/./up/../down/../././//index.php/.", "query" => null)));
-printf("%s\n", new http\Url(null, null, 0));
+printf("%s\n", new http\Env\Url);
+printf("%s\n", new http\Env\Url("other", "index"));
+printf("%s\n", new http\Env\Url(array("scheme" => "https", "port" => 443)));
+printf("%s\n", new http\Env\Url(array("path" => "/./up/../down/../././//index.php/.", "query" => null), null, http\Url::SANITIZE_PATH|http\Url::FROM_ENV));
+printf("%s\n", new http\Env\Url(null, null, 0));
+printf("%s\n", new http\Url(null, null, http\Url::FROM_ENV));
 ?>
 DONE
 --EXPECTF--
@@ -21,5 +24,6 @@ http://example.com:55555/?s=b&i=0&e=&a[]=1&a[]=2
 http://example.com:55555/index?s=b&i=0&e=&a[]=1&a[]=2
 https://example.com/?s=b&i=0&e=&a[]=1&a[]=2
 http://example.com:55555/index.php/
-http://localhost/
+http://example.com:55555/?s=b&i=0&e=&a[]=1&a[]=2
+http://example.com:55555/?s=b&i=0&e=&a[]=1&a[]=2
 DONE