com php-src: Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails: ext/standard/html.c

Commit: 3a4a25358fe3f389c434f68e59bfd70b25b93b29 Author: Anatoliy Belsky <ab@php.net> Tue, 8 May 2012 17:42:01 +0200 Parents: e120a0c7f30953774d3ff2ac1a14b2ab623a047c Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3a4a25358fe3f389c434f68e59bfd70b25b93b29 Log: Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails There is a logic error in charset detection part for htmlentities. When mbstring is compiled shared and mbstring.internal_encoding is set to pass, it prevents default_charset from being checked resulting iso-8859-1 being choosed. Bugs: https://bugs.php.net/61713 Changed paths: M ext/standard/html.c Diff: diff --git a/ext/standard/html.c b/ext/standard/html.c index 81c69de..c813af5 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -793,8 +793,11 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) charset_hint = NULL; len = 0; } + } else { + /* Jump to det_charset only if mbstring isn't one of above eq pass, auto, none. + Otherwise try default_charset next */ + goto det_charset; } - goto det_charset; } } #endif