Commit 8995f60

committed

mb_decode_mimeheader obeys RFC 2047 regarding underscores and QPrint encoding

1 parent 157ca65 commit 8995f60Copy full SHA for 8995f60

File tree

+37

-2

lines changed

+37

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ PHP NEWS`
`52`	`52`	`. Added json_validate(). (Juan Morales)`
`53`	`53`
`54`	`54`	`- MBString:`
`55`		`- . mb_detect_encoding is better able to identify the correct encoding for Turkish text. (Alex Dowad)`
	`55`	`+ . mb_detect_encoding is better able to identify the correct encoding for`
	`56`	`+ Turkish text. (Alex Dowad)`
`56`	`57`	`. mb_detect_encoding's "non-strict" mode now behaves as described in the`
`57`	`58`	`documentation. Previously, it would return false if the very first byte`
`58`	`59`	`of the input string was invalid in all candidate encodings. (Alex Dowad)`
`@@ -62,6 +63,10 @@ PHP NEWS`
`62`	`63`	`MB_CASE_LOWER_SIMPLE and MB_CASE_TITLE_SIMPLE. (Alex Dowad)`
`63`	`64`	`. mb_detect_encoding is better able to identify UTF-8 and UTF-16 strings`
`64`	`65`	`with a byte-order mark. (Alex Dowad)`
	`66`	`+ . mb_decode_mimeheader interprets underscores in QPrint-encoded MIME`
	`67`	`+ encoded words as required by RFC 2047; they are converted to spaces.`
	`68`	`+ Underscores must be encoded as "=5F" in such MIME encoded words.`
	`69`	`+ (Alex Dowad)`
`65`	`70`
`66`	`71`	`- Opcache:`
`67`	`72`	`. Added start, restart and force restart time to opcache's`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ PHP 8.3 UPGRADE NOTES`
`78`	`78`	`casing rules for the Greek letter sigma. For mb_convert_case, conditional`
`79`	`79`	`casing only applies to MB_CASE_LOWER and MB_CASE_TITLE modes, not to`
`80`	`80`	`MB_CASE_LOWER_SIMPLE and MB_CASE_TITLE_SIMPLE. (Alex Dowad)`
	`81`	`+ . mb_decode_mimeheader interprets underscores in QPrint-encoded MIME`
	`82`	`+ encoded words as required by RFC 2047; they are converted to spaces.`
	`83`	`+ Underscores must be encoded as "=5F" in such MIME encoded words.`
	`84`	`+ (Alex Dowad)`
`81`	`85`
`82`	`86`	`- Standard:`
`83`	`87`	`. E_NOTICEs emitted by unserialized() have been promoted to E_WARNING.`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5705,7 +5705,10 @@ static unsigned char* mime_header_decode_encoded_word(unsigned char *p, unsigned`
`5705`	`5705`	/* Fill `buf` with bytes from decoding QPrint */
`5706`	`5706`	`while (p < e) {`
`5707`	`5707`	`unsigned char c = *p++;`
`5708`		`- if (c == '=' && (e - p) >= 2) {`
	`5708`	`+ if (c == '_') {`
	`5709`	`+ *bufp++ = ' ';`
	`5710`	`+ continue;`
	`5711`	`+ } else if (c == '=' && (e - p) >= 2) {`
`5709`	`5712`	`unsigned char c2 = *p++;`
`5710`	`5713`	`unsigned char c3 = *p++;`
`5711`	`5714`	`if (qprint_map[c2] >= 0 && qprint_map[c3] >= 0) {`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,23 @@`
	`1`	`+--TEST--`
	`2`	`+Test mb_decode_mimeheader() function: use of underscores in QPrint-encoded data`
	`3`	`+--EXTENSIONS--`
	`4`	`+mbstring`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+`
	`8`	`+// RFC 2047 says that in a QPrint-encoded MIME encoded word, underscores should be converted to spaces`
	`9`	`+var_dump(mb_decode_mimeheader("=?UTF-8?Q?abc?="));`
	`10`	`+var_dump(mb_decode_mimeheader("=?UTF-8?Q?abc_def?="));`
	`11`	`+var_dump(mb_decode_mimeheader("_=?UTF-8?Q?abc_def?=_"));`
	`12`	`+var_dump(mb_decode_mimeheader("=?UTF-8?Q?__=E6=B1=89=E5=AD=97__?="));`
	`13`	`+`
	`14`	`+// This is how underscores should be encoded in MIME encoded words with QPrint`
	`15`	`+var_dump(mb_decode_mimeheader("=?UTF-8?Q?=5F?="));`
	`16`	`+`
	`17`	`+?>`
	`18`	`+--EXPECT--`
	`19`	`+string(3) "abc"`
	`20`	`+string(7) "abc def"`
	`21`	`+string(9) "_abc def_"`
	`22`	`+string(10) " 汉字 "`
	`23`	`+string(1) "_"`

Comments

(0)