summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-04-17 14:25:34 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-04-17 14:25:34 +0200
commitf9e918b17dba9ea5dbd8e78cad083227c12ccd59 (patch)
tree0478ec94e8a0abbe3aa393a1b244679758b3725f /tests/basic
parent1d53d6df7e9ab75baf3b0fdc38572ae8f4b7ee41 (diff)
parent487d4d07b452245392369dd4d08554ee71e95a29 (diff)
downloadphp-git-f9e918b17dba9ea5dbd8e78cad083227c12ccd59.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/029.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/029.phpt b/tests/basic/029.phpt
index 6d95c0771d..21d9082cff 100644
--- a/tests/basic/029.phpt
+++ b/tests/basic/029.phpt
@@ -9,8 +9,8 @@ if (!extension_loaded("mbstring")) {
--INI--
file_uploads=1
mbstring.encoding_translation=1
-mbstring.http_input=Shift_JIS
-mbstring.internal_encoding=UTF-8
+input_encoding=Shift_JIS
+internal_encoding=UTF-8
--POST_RAW--
Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
-----------------------------20896060251896012921717172737