From: Yasuo Ohgaki <yohgaki@php.net>
Date: Thu, 8 Sep 2016 04:32:31 +0000 (+0900)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0RC2~49^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=379d9a1cfc64626d3d7627aaf53c22cb950ec343;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
---

379d9a1cfc64626d3d7627aaf53c22cb950ec343
diff --cc ext/mbstring/mbstring.c
index baec14c70c,024da7d32b..5524b4180d
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -1250,7 -1260,7 +1250,7 @@@ static PHP_INI_MH(OnUpdate_mbstring_htt
  	const mbfl_encoding **list;
  	size_t size;
  
- 	if (!new_value) {
 -	if (!new_value || !new_value_length) {
++	if (!new_value || !ZSTR_VAL(new_value)) {
  		if (MBSTRG(http_input_list)) {
  			pefree(MBSTRG(http_input_list), 1);
  		}