summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2012-03-02 05:04:40 +0000
committerRasmus Lerdorf <rasmus@php.net>2012-03-02 05:04:40 +0000
commitbc8e8b34674697e82c852c61dce94717d43bb874 (patch)
treeaaaa226ae3c5c7621794d63a97ee645b6f215c23
parentbcb9768f9e7e1989e94350b880305133b064dfb3 (diff)
downloadphp-git-bc8e8b34674697e82c852c61dce94717d43bb874.tar.gz
Fix tests that break if filter.default isn't set to unsafe_raw
-rw-r--r--ext/mbstring/tests/htmlent.phpt1
-rw-r--r--ext/standard/tests/strings/htmlentities13.phpt1
-rw-r--r--ext/standard/tests/strings/htmlentities14.phpt1
-rw-r--r--ext/standard/tests/strings/parse_str_basic3.phptbin5114 -> 5140 bytes
-rw-r--r--tests/basic/022.phpt1
-rw-r--r--tests/basic/023.phpt1
6 files changed, 5 insertions, 0 deletions
diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index 33c3a5be52..5af96c7c41 100644
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -15,6 +15,7 @@ mbstring.http_input=HTML-ENTITIES
mbstring.internal_encoding=UTF-8
mbstring.http_output=HTML-ENTITIES
mbstring.encoding_translation=1
+filter.default=unsafe_raw
--FILE--
<?php
// enable output encoding through output handler
diff --git a/ext/standard/tests/strings/htmlentities13.phpt b/ext/standard/tests/strings/htmlentities13.phpt
index 73b630f60c..769c77fde9 100644
--- a/ext/standard/tests/strings/htmlentities13.phpt
+++ b/ext/standard/tests/strings/htmlentities13.phpt
@@ -4,6 +4,7 @@ htmlentities() test 13 (default_charset / EUC-JP)
output_handler=
mbstring.internal_encoding=pass
default_charset=EUC-JP
+filter.default=unsafe_raw
--FILE--
<?php
print ini_get('default_charset')."\n";
diff --git a/ext/standard/tests/strings/htmlentities14.phpt b/ext/standard/tests/strings/htmlentities14.phpt
index a97cac536d..0928f08488 100644
--- a/ext/standard/tests/strings/htmlentities14.phpt
+++ b/ext/standard/tests/strings/htmlentities14.phpt
@@ -4,6 +4,7 @@ htmlentities() test 14 (default_charset / Shift_JIS)
output_handler=
mbstring.internal_encoding=pass
default_charset=Shift_JIS
+filter.default=unsafe_raw
--FILE--
<?php
print ini_get('default_charset')."\n";
diff --git a/ext/standard/tests/strings/parse_str_basic3.phpt b/ext/standard/tests/strings/parse_str_basic3.phpt
index 8c75df440f..84f6a53bb1 100644
--- a/ext/standard/tests/strings/parse_str_basic3.phpt
+++ b/ext/standard/tests/strings/parse_str_basic3.phpt
Binary files differ
diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
index 64314ee9ee..0ab70d4be7 100644
--- a/tests/basic/022.phpt
+++ b/tests/basic/022.phpt
@@ -2,6 +2,7 @@
Cookies test#1
--INI--
max_input_vars=1000
+filter.default=unsafe_raw
--COOKIE--
cookie1=val1 ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie 5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10
--FILE--
diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt
index 07fe9d6d3f..ca5f1dcfbb 100644
--- a/tests/basic/023.phpt
+++ b/tests/basic/023.phpt
@@ -2,6 +2,7 @@
Cookies test#2
--INI--
max_input_vars=1000
+filter.default=unsafe_raw
--COOKIE--
c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","value",UEhQIQ==;UEhQIQ==foo
--FILE--