Merge branch 'PHP-5.6' into PHP-7.0

Yasuo Ohgaki · Yasuo Ohgaki · commit 379d9a1cfc64 · 2016-09-08T13:32:31.000+09:00
* PHP-5.6:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -1250,7 +1250,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)
 	const mbfl_encoding **list;
 	size_t size;
 
-	if (!new_value) {
+	if (!new_value || !ZSTR_VAL(new_value)) {
 		if (MBSTRG(http_input_list)) {
 			pefree(MBSTRG(http_input_list), 1);
 		}
@@ -1318,7 +1318,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
 {
 	const mbfl_encoding *encoding;
 
-	if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) {
+	if (!new_value || !new_value_length || !(encoding = mbfl_name2encoding(new_value))) {
 		/* falls back to UTF-8 if an unknown encoding name is given */
 		encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1250,7 +1250,7 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input)`
`1250`	`1250`	`const mbfl_encoding **list;`
`1251`	`1251`	`size_t size;`
`1252`	`1252`
`1253`		`- if (!new_value) {`
	`1253`	`+ if (!new_value \|\| !ZSTR_VAL(new_value)) {`
`1254`	`1254`	`if (MBSTRG(http_input_list)) {`
`1255`	`1255`	`pefree(MBSTRG(http_input_list), 1);`
`1256`	`1256`	`}`
`@@ -1318,7 +1318,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v`
`1318`	`1318`	`{`
`1319`	`1319`	`const mbfl_encoding *encoding;`
`1320`	`1320`
`1321`		`- if (!new_value \|\| new_value_length == 0 \|\| !(encoding = mbfl_name2encoding(new_value))) {`
	`1321`	`+ if (!new_value \|\| !new_value_length \|\| !(encoding = mbfl_name2encoding(new_value))) {`
`1322`	`1322`	`/* falls back to UTF-8 if an unknown encoding name is given */`
`1323`	`1323`	`encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);`
`1324`	`1324`	`}`