summaryrefslogtreecommitdiff
path: root/sapi/cgi/tests
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2014-02-13 11:54:52 +0900
committerYasuo Ohgaki <yohgaki@php.net>2014-02-13 11:54:52 +0900
commitcbd108abf19d9fb9ae1d4ccd153215f56a2763e8 (patch)
tree8a0631208c010d7b4baab089d1a7e56d1f6e6d0e /sapi/cgi/tests
parent06bbfe1e2a46d6c2eaf74b7c576b09114ee2e670 (diff)
downloadphp-git-cbd108abf19d9fb9ae1d4ccd153215f56a2763e8.tar.gz
Implement RFC https://wiki.php.net/rfc/default_encoding
Diffstat (limited to 'sapi/cgi/tests')
-rw-r--r--sapi/cgi/tests/010.phpt6
-rw-r--r--sapi/cgi/tests/011.phpt22
2 files changed, 14 insertions, 14 deletions
diff --git a/sapi/cgi/tests/010.phpt b/sapi/cgi/tests/010.phpt
index e633ad28ba..67e1a69e26 100644
--- a/sapi/cgi/tests/010.phpt
+++ b/sapi/cgi/tests/010.phpt
@@ -40,14 +40,14 @@ echo "Done\n";
--EXPECTF--
Status: 403 Forbidden
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
Status: 403 Forbidden
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
X-Powered-By: PHP/%s
Status: 403 Also Forbidden
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
Done
diff --git a/sapi/cgi/tests/011.phpt b/sapi/cgi/tests/011.phpt
index 177df021a6..6d4a6ed7f9 100644
--- a/sapi/cgi/tests/011.phpt
+++ b/sapi/cgi/tests/011.phpt
@@ -65,18 +65,18 @@ header_remove("X-Foo");
<?php ?>
----------
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php header_remove(); ?>
----------
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php header_remove("X-Foo"); ?>
----------
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php
@@ -85,7 +85,7 @@ header("X-Foo: Bar");
----------
X-Powered-By: PHP/%s
X-Foo: Bar
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php
@@ -96,7 +96,7 @@ header_remove("X-Foo");
----------
X-Powered-By: PHP/%s
X-Bar: Baz
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php
@@ -106,7 +106,7 @@ header_remove("X-Foo: Bar");
----------
X-Powered-By: PHP/%s
X-Foo: Bar
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
Warning: Header to delete may not contain colon. in %s on line 3
@@ -118,7 +118,7 @@ header_remove("X-Foo:");
----------
X-Powered-By: PHP/%s
X-Foo: Bar
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
Warning: Header to delete may not contain colon. in %s on line 3
@@ -128,7 +128,7 @@ header("X-Foo: Bar");
header_remove();
?>
----------
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php
@@ -136,7 +136,7 @@ header_remove("");
?>
----------
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
----------
<?php
@@ -144,7 +144,7 @@ header_remove(":");
?>
----------
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
Warning: Header to delete may not contain colon. in %s on line 2
@@ -158,7 +158,7 @@ header_remove("X-Foo");
----------
X-Powered-By: PHP/%s
X-Foo: Bar
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
flush