diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
| commit | 12b15e5ca4ae7ebf6e50551a4c666ece97068074 (patch) | |
| tree | af4eaae6897444c3d8a987d59b695984a26d25d7 /ext/standard/html.c | |
| parent | 545c296ef4b5ffdb1cf59583c55129f08d75601b (diff) | |
| parent | 6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff) | |
| download | php-git-12b15e5ca4ae7ebf6e50551a4c666ece97068074.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/standard/html.c')
| -rw-r--r-- | ext/standard/html.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index a7c58d5bce..dfe30d9b3e 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -392,9 +392,9 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) if (zenc != NULL) { charset_hint = (char *)zend_multibyte_get_encoding_name(zenc); if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) { - if ((len == 4) /* sizeof (none|auto|pass) */ && + if ((len == 4) /* sizeof (auto|pass) */ && + /* XXX should the "wchar" be ignored as well?? */ (!memcmp("pass", charset_hint, 4) || - !memcmp("auto", charset_hint, 4) || !memcmp("auto", charset_hint, 4))) { charset_hint = NULL; len = 0; |