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

fix #2050

This commit is contained in:
gorhill 2016-10-05 18:18:32 -04:00
parent e436a9be93
commit 751e34f3ce
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/traffic.js
View File

@ -451,6 +451,14 @@ var processCSP = function(details, pageStore, context) {
µb.staticNetFilteringEngine.matchStringExactType(context, requestURL, 'websocket'); µb.staticNetFilteringEngine.matchStringExactType(context, requestURL, 'websocket');
var websocketResult = µb.staticNetFilteringEngine.toResultString(loggerEnabled), var websocketResult = µb.staticNetFilteringEngine.toResultString(loggerEnabled),
blockWebsocket = µb.isBlockResult(websocketResult); blockWebsocket = µb.isBlockResult(websocketResult);
// https://github.com/gorhill/uBlock/issues/2050
// Blanket-blocking websockets is exceptional, so we test whether the
// page is whitelisted if and only if there is a hit against a websocket
// filter.
if ( blockWebsocket && pageStore.getNetFilteringSwitch() === false ) {
websocketResult = '';
blockWebsocket = false;
}
var headersChanged = false; var headersChanged = false;
if ( blockInlineScript || blockWebsocket ) { if ( blockInlineScript || blockWebsocket ) {