Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #3562

This commit is contained in:
Raymond Hill 2018-03-01 14:12:16 -05:00
parent 8d5ebf44ef
commit 8cf87061f4
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/traffic.js
View File

@ -603,9 +603,16 @@ var filterDocument = (function() {
return textDecoder.decode(buffer);
};
var reContentTypeDocument = /^(?:text\/html|application\/xhtml+xml)/i,
var reContentTypeDocument = /^(?:text\/html|application\/xhtml\+xml)/i,
reContentTypeCharset = /charset=['"]?([^'" ]+)/i;
var mimeFromContentType = function(contentType) {
var match = reContentTypeDocument.exec(contentType);
if ( match !== null ) {
return match[0].toLowerCase();
}
};
var charsetFromContentType = function(contentType) {
var match = reContentTypeCharset.exec(contentType);
if ( match !== null ) {
@ -786,7 +793,7 @@ var filterDocument = (function() {
}
doc = domParser.parseFromString(
utf8TextDecoder.decode(filterer.buffer.slice(0, 1024)),
'text/html'
filterer.mime
);
charsetFound = charsetFromDoc(doc);
charsetUsed = µb.textEncode.normalizeCharset(charsetFound);
@ -797,7 +804,7 @@ var filterDocument = (function() {
doc = domParser.parseFromString(
textDecode(charsetUsed, filterer.buffer),
'text/html'
filterer.mime
);
// https://github.com/gorhill/uBlock/issues/3507
@ -812,7 +819,7 @@ var filterDocument = (function() {
charsetUsed = charsetFound;
doc = domParser.parseFromString(
textDecode(charsetFound, filterer.buffer),
'text/html'
filterer.mime
);
}
}
@ -879,6 +886,7 @@ var filterDocument = (function() {
selectors: undefined,
scriptlets: undefined,
buffer: null,
mime: undefined,
charset: undefined
};
@ -906,7 +914,8 @@ var filterDocument = (function() {
var headers = details.responseHeaders,
contentType = headerValueFromName('content-type', headers);
if ( contentType !== '' ) {
if ( reContentTypeDocument.test(contentType) === false ) { return; }
request.mime = mimeFromContentType(contentType);
if ( request.mime === undefined ) { return; }
var charset = charsetFromContentType(contentType);
if ( charset !== undefined ) {
charset = µb.textEncode.normalizeCharset(charset);