From 6fab9079209ac6152f858d24a074d2447c6694df Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 19 Sep 2014 09:26:07 +0200 Subject: there can be only one ... of the identical expressions --- ext/standard/html.c | 1 - 1 file changed, 1 deletion(-) (limited to 'ext/standard/html.c') diff --git a/ext/standard/html.c b/ext/standard/html.c index a7c58d5bce..95543eea52 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -394,7 +394,6 @@ static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC) if (charset_hint != NULL && (len=strlen(charset_hint)) != 0) { if ((len == 4) /* sizeof (none|auto|pass) */ && (!memcmp("pass", charset_hint, 4) || - !memcmp("auto", charset_hint, 4) || !memcmp("auto", charset_hint, 4))) { charset_hint = NULL; len = 0; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/standard/html.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/html.c') diff --git a/ext/standard/html.c b/ext/standard/html.c index 95543eea52..e918e9586e 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 | +----------------------------------------------------------------------+ -- cgit v1.2.1 From 2be8fdcfd6b719cf21e4344c75b46fd5704727e4 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 19 Sep 2014 19:35:29 +0200 Subject: updated the comment to charset_hint --- ext/standard/html.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ext/standard/html.c') diff --git a/ext/standard/html.c b/ext/standard/html.c index e918e9586e..dfe30d9b3e 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -392,7 +392,8 @@ 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))) { charset_hint = NULL; -- cgit v1.2.1