Merge branch 'master' into dev-language

This commit is contained in:
Ai Lin Chia
2018-03-28 11:15:49 +02:00

@ -329,7 +329,7 @@ uint16_t GbEncoding::getCharset(HttpMime *mime, const char *url, const char *s,
int bytes_consumed;
Encoding encoding = CompactEncDet::DetectEncoding(s, slen,
nullptr, mime_charset_ptr, meta_charset_ptr,
url, mime_charset_ptr, meta_charset_ptr,
UNKNOWN_ENCODING, UNKNOWN_LANGUAGE,
CompactEncDet::WEB_CORPUS, false,
&bytes_consumed, &is_reliable);