1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 03:12:33 +01:00

Manually import df97249715 from 1.21.4

Related commit:
- https://github.com/gorhill/uBlock/commit/df972497156e
This commit is contained in:
Raymond Hill 2019-07-22 06:30:00 -04:00
parent fa20946bc4
commit 47cfba1551
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2

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 (
this.warURL !== undefined &&
fctxt instanceof Object &&
fctxt.type !== 'xmlhttprequest' /*&&
(
suffersSpuriousRedirectConflicts === false ||
fctxt.url.startsWith('https:')
)*/
fctxt.type !== 'xmlhttprequest'
) {
return `${this.warURL}${vAPI.warSecret()}`;
}