Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-18 17:02:27 +02:00
Code Issues Releases Wiki Activity

Remove fix to https://github.com/gorhill/uBlock/issues/3639

Browse Source 
Related discussion:
- a54cb2e38f (commitcomment-34387041)

There no more spurious warning from the browser since
Chromium 70, this was fixed in:

https://bugs.chromium.org/p/chromium/issues/detail?id=111700#c42

Removing the special handling code means users of
Chromium 69 and earlier will be back suffering the
spurious warning, but both uBO and HTTPS-Everywhere
function as intended.
This commit is contained in:
Raymond Hill 2019-07-22 06:13:58 -04:00
parent bb282d4c76
commit df97249715
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/version vendored
View File

@ -1 +1 @@
1.21.2 1.21.4

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

@ -177,14 +177,6 @@ const mimeFromName = function(name) {
} }
}; };
// 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.
const suffersSpuriousRedirectConflicts = vAPI.webextFlavor.soup.has('chromium');
/******************************************************************************/ /******************************************************************************/
/******************************************************************************/ /******************************************************************************/
@ -206,11 +198,7 @@ RedirectEntry.prototype.toURL = function(fctxt) {
if ( if (
this.warURL !== undefined && this.warURL !== undefined &&
fctxt instanceof Object && fctxt instanceof Object &&
fctxt.type !== 'xmlhttprequest' && fctxt.type !== 'xmlhttprequest'
(
suffersSpuriousRedirectConflicts === false ||
fctxt.url.startsWith('https:')
)
) { ) {
return `${this.warURL}${vAPI.warSecret()}`; return `${this.warURL}${vAPI.warSecret()}`;
} }