Skip to content

Commit 474d3c8

Browse files
committed
Add GB18030-2022 to default encoding list for zh-CN
1 parent ada7400 commit 474d3c8

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ PHP NEWS
2020
. Fixed bug GH-20483 (ASAN stack overflow with fiber.stack_size INI
2121
small value). (David Carlier)
2222

23+
- Mbstring:
24+
. Added GB18030-2022 to default encoding list for zh-CN. (HeRaNO)
25+
2326
- Opcache:
2427
. Fixed bug GH-20051 (apache2 shutdowns when restart is requested during
2528
preloading). (Arnaud, welcomycozyhom)

UPGRADING.INTERNALS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ PHP 8.6 INTERNALS UPGRADE NOTES
6464
. Removed the XML_GetCurrentByteCount() libxml compatibility wrapper,
6565
as it was unused and could return the wrong result.
6666

67+
- ext/mbstring:
68+
. Added GB18030-2022 to default encoding list for zh-CN.
69+
6770
========================
6871
4. OpCode changes
6972
========================

ext/mbstring/mbstring.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ static const enum mbfl_no_encoding php_mb_default_identify_list_cn[] = {
116116
mbfl_no_encoding_ascii,
117117
mbfl_no_encoding_utf8,
118118
mbfl_no_encoding_euc_cn,
119-
mbfl_no_encoding_cp936
119+
mbfl_no_encoding_cp936,
120+
mbfl_no_encoding_gb18030_2022
120121
};
121122

122123
static const enum mbfl_no_encoding php_mb_default_identify_list_tw_hk[] = {

0 commit comments

Comments
 (0)