Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-04 01:59:38 +02:00
Code Issues Releases Wiki Activity

fix #3639

Browse Source
This commit is contained in:
Raymond Hill 2018-04-24 05:48:28 -04:00
parent adcc8c1a27
commit 10a4a6465e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/redirect-engine.js
View File

@ -70,6 +70,14 @@ var warResolve = (function() {
};
})();
// https://github.com/gorhill/uBlock/issues/3639
// https://github.com/EFForg/https-everywhere/issues/14961
// https://bugs.chromium.org/p/chromium/issues/detail?id=111700
// Do not redirect to a WAR if the platform suffers from spurious redirect
// conflicts, and the request to redirect is not `https:`.
// This special handling code can removed once the Chromium issue is fixed.
var suffersSpuriousRedirectConflicts = vAPI.webextFlavor.soup.has('chromium');
/******************************************************************************/
/******************************************************************************/
@ -91,7 +99,11 @@ RedirectEntry.prototype.toURL = function(details) {
if (
this.warURL !== undefined &&
details instanceof Object &&
details.requestType !== 'xmlhttprequest'
details.requestType !== 'xmlhttprequest' &&
(
suffersSpuriousRedirectConflicts === false ||
details.requestURL.startsWith('https:')
)
) {
return this.warURL + '?secret=' + vAPI.warSecret;
}