Implement RFC https://wiki.php.net/rfc/default_encoding

20 files changed, 40 insertions, 40 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
 
diff --git a/sapi/cli/tests/bug43177.phpt b/sapi/cli/tests/bug43177.phpt
index 36b5504ab0..a97769cf8f 100644
--- a/sapi/cli/tests/bug43177.phpt
+++ b/sapi/cli/tests/bug43177.phpt
@@ -60,23 +60,23 @@ HTTP/1.1 200 OK
 Host: localhost
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 OK
 HTTP/1.0 500 Internal Server Error
 Host: localhost
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 HTTP/1.0 500 Internal Server Error
 Host: localhost
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 HTTP/1.0 500 Internal Server Error
 Host: localhost
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt
index 3a97c7e910..901ba188fd 100644
--- a/sapi/cli/tests/bug65066_100.phpt
+++ b/sapi/cli/tests/bug65066_100.phpt
@@ -36,4 +36,4 @@ HTTP/1.1 100 Continue
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt
index 2552d1d11d..4e5d31c7a7 100644
--- a/sapi/cli/tests/bug65066_422.phpt
+++ b/sapi/cli/tests/bug65066_422.phpt
@@ -36,4 +36,4 @@ HTTP/1.1 422 Unknown Status Code
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt
index aa4a9a0030..a0b4eae393 100644
--- a/sapi/cli/tests/bug65066_511.phpt
+++ b/sapi/cli/tests/bug65066_511.phpt
@@ -36,4 +36,4 @@ HTTP/1.1 511 Network Authentication Required
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/bug65633.phpt b/sapi/cli/tests/bug65633.phpt
index 55834095b1..456436b1f7 100644
--- a/sapi/cli/tests/bug65633.phpt
+++ b/sapi/cli/tests/bug65633.phpt
@@ -39,7 +39,7 @@ fclose($fp);
 HTTP/1.1 200 OK
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 array(1) {
   ["foo"]=>
diff --git a/sapi/cli/tests/php_cli_server_004.phpt b/sapi/cli/tests/php_cli_server_004.phpt
index b61f88637e..8b913f6596 100644
--- a/sapi/cli/tests/php_cli_server_004.phpt
+++ b/sapi/cli/tests/php_cli_server_004.phpt
@@ -40,7 +40,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(19) "HTTP_HOST:localhost"
 string(21) "HTTP_USER_AGENT:dummy"
diff --git a/sapi/cli/tests/php_cli_server_005.phpt b/sapi/cli/tests/php_cli_server_005.phpt
index ccc0f8f3ab..cdd0ae902f 100644
--- a/sapi/cli/tests/php_cli_server_005.phpt
+++ b/sapi/cli/tests/php_cli_server_005.phpt
@@ -52,7 +52,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 array(1) {
   ["userfile"]=>
diff --git a/sapi/cli/tests/php_cli_server_006.phpt b/sapi/cli/tests/php_cli_server_006.phpt
index 09e7ab07a5..ad6d6c9598 100644
--- a/sapi/cli/tests/php_cli_server_006.phpt
+++ b/sapi/cli/tests/php_cli_server_006.phpt
@@ -36,7 +36,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(3) "foo"
 string(3) "bar"
diff --git a/sapi/cli/tests/php_cli_server_007.phpt b/sapi/cli/tests/php_cli_server_007.phpt
index 64d4df0ed7..6420ff5a41 100644
--- a/sapi/cli/tests/php_cli_server_007.phpt
+++ b/sapi/cli/tests/php_cli_server_007.phpt
@@ -37,4 +37,4 @@ Host: %s
 Connection: close
 X-Powered-By: PHP/%s
 WWW-Authenticate: Digest realm="foo",qop="auth",nonce="XXXXX",opaque="acbd18db4cc2f85cedef654fccc4a4d8"
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
diff --git a/sapi/cli/tests/php_cli_server_008.phpt b/sapi/cli/tests/php_cli_server_008.phpt
index 2e68e24059..01f825a746 100644
--- a/sapi/cli/tests/php_cli_server_008.phpt
+++ b/sapi/cli/tests/php_cli_server_008.phpt
@@ -56,13 +56,13 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(8) "HTTP/1.1"
 HTTP/1.0 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(8) "HTTP/1.0"
diff --git a/sapi/cli/tests/php_cli_server_009.phpt b/sapi/cli/tests/php_cli_server_009.phpt
index 2beaeedab6..231797160f 100644
--- a/sapi/cli/tests/php_cli_server_009.phpt
+++ b/sapi/cli/tests/php_cli_server_009.phpt
@@ -80,14 +80,14 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(8) "/foo/bar"
 HTTP/1.0 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(9) "/foo/bar/"
 HTTP/1.0 404 Not Found
diff --git a/sapi/cli/tests/php_cli_server_010.phpt b/sapi/cli/tests/php_cli_server_010.phpt
index 2ef018b857..30e6d047a7 100644
--- a/sapi/cli/tests/php_cli_server_010.phpt
+++ b/sapi/cli/tests/php_cli_server_010.phpt
@@ -57,7 +57,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(18) "/index.php/foo/bar"
 string(10) "/index.php"
@@ -67,7 +67,7 @@ HTTP/1.0 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(19) "/index.php/foo/bar/"
 string(10) "/index.php"
diff --git a/sapi/cli/tests/php_cli_server_012.phpt b/sapi/cli/tests/php_cli_server_012.phpt
index 9a1e60c48b..302540f7e6 100644
--- a/sapi/cli/tests/php_cli_server_012.phpt
+++ b/sapi/cli/tests/php_cli_server_012.phpt
@@ -42,7 +42,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 Array
 (
diff --git a/sapi/cli/tests/php_cli_server_015.phpt b/sapi/cli/tests/php_cli_server_015.phpt
index 6fb0169244..e3d8c4170d 100644
--- a/sapi/cli/tests/php_cli_server_015.phpt
+++ b/sapi/cli/tests/php_cli_server_015.phpt
@@ -43,7 +43,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 <br />
 <b>Fatal error</b>:  Call to undefined function non_exists_function() in <b>%ssyntax_error.php</b> on line <b>%s</b><br />
diff --git a/sapi/cli/tests/php_cli_server_017.phpt b/sapi/cli/tests/php_cli_server_017.phpt
index 73530af480..34e7d5e289 100644
--- a/sapi/cli/tests/php_cli_server_017.phpt
+++ b/sapi/cli/tests/php_cli_server_017.phpt
@@ -39,6 +39,6 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(%d) "%sindex.php"
diff --git a/sapi/cli/tests/php_cli_server_018.phpt b/sapi/cli/tests/php_cli_server_018.phpt
index deb9348768..44e1292934 100644
--- a/sapi/cli/tests/php_cli_server_018.phpt
+++ b/sapi/cli/tests/php_cli_server_018.phpt
@@ -39,6 +39,6 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: %s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 string(5) "PATCH"
diff --git a/sapi/cli/tests/php_cli_server_019.phpt b/sapi/cli/tests/php_cli_server_019.phpt
index 2b983e5c0a..aeb7a9f891 100644
--- a/sapi/cli/tests/php_cli_server_019.phpt
+++ b/sapi/cli/tests/php_cli_server_019.phpt
@@ -44,7 +44,7 @@ Host: %s
 Connection: close
 X-Powered-By: %s
 Bar-Foo: Foo
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 array(2) {
   ["Host"]=>
@@ -64,5 +64,5 @@ array(3) {
   ["Bar-Foo"]=>
   string(3) "Foo"
   ["Content-type"]=>
-  string(9) "text/html"
+  string(24) "text/html; charset=UTF-8"
 }
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index b8416ea730..707eddbad3 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -43,7 +43,7 @@ if (!$fp) {
 }
 
 $prev = "----123
-Content-Type: text/plain
+Content-Type: text/plain; charset=UTF-8
 Content-Disposition: form-data; name=\"file1\"; filename=\"file1.txt\"\n\n";
 $post = "\n----123--\n";
 $total = $length + strlen($prev) + strlen($post);
@@ -79,7 +79,7 @@ HTTP/1.1 200 OK
 Host: %s
 Connection: close
 X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html; charset=UTF-8
 
 array(1) {
   ["file1"]=>