From f3c1722b0cd160f068df640957a42f5bc7ff366a Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 15 Aug 2006 15:09:38 +0000 Subject: [PATCH] MFH: don't try to use "auto", "none" and "pass" charsets returned from mbstring --- ext/standard/html.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ext/standard/html.c b/ext/standard/html.c index b1d05fd893..02b2608112 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -756,6 +756,15 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) charset_hint = Z_STRVAL_P(uf_result); len = Z_STRLEN_P(uf_result); + if (len == 4) { /* sizeof(none|auto|pass)-1 */ + if (!memcmp("pass", charset_hint, sizeof("pass") - 1) || + !memcmp("auto", charset_hint, sizeof("auto") - 1) || + !memcmp("none", charset_hint, sizeof("none") - 1)) { + + charset_hint = NULL; + len = 0; + } + } goto det_charset; } } -- 2.50.1