com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mbstring/mbstring.c
| From: | Yasuo Ohgaki | Date: | Thu, 08 Sep 2016 04:32:31 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94360@lists.php.net to get a copy of this message | ||
Commit: 379d9a1cfc64626d3d7627aaf53c22cb950ec343
Author: Yasuo Ohgaki <yohgaki@php.net> Thu, 8 Sep 2016 13:32:31 +0900
Parents: af3031d755801546cc52117c5f8c864c062248b8 8bbd0952e5bba88426bac1596dcc3bfa504dbe4e
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=379d9a1cfc64626d3d7627aaf53c22cb950ec343
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Bugs:
https://bugs.php.net/72992
Changed paths:
MM ext/mbstring/mbstring.c
Diff:
diff --cc ext/mbstring/mbstring.c
index baec14c,024da7d..5524b41
--- 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);
}