wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1195167 part 3: Remove more scheme-specific handling from FetchDriver. r=bkelly

Browse Source
This commit is contained in:
Jonas Sicking 2015-10-19 18:24:36 -07:00
parent 1386e9121e
commit 4a0cdd109f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/fetch/FetchDriver.cpp
View File

@ -132,20 +132,19 @@ FetchDriver::SetTaintingAndGetNextOp()
// Begin Step 8 of the Main Fetch algorithm
// https://fetch.spec.whatwg.org/#fetching
nsAutoCString scheme;
rv = requestURI->GetScheme(scheme);
if (NS_WARN_IF(NS_FAILED(rv))) {
return MainFetchOp(NETWORK_ERROR);
}
MOZ_ASSERT_IF(mRequest->Mode() == RequestMode::Same_origin ||
mRequest->Mode() == RequestMode::No_cors, !mCORSFlagEverSet);
// request's current url's origin is request's origin and the CORS flag is unset
// request's current url's scheme is "data" and request's same-origin data-URL flag is set
// request's current url's scheme is "about"
rv = mPrincipal->CheckMayLoad(requestURI, false /* report */,
false /* allowIfInheritsPrincipal */);
if ((!mCORSFlagEverSet && NS_SUCCEEDED(rv)) ||
(scheme.EqualsLiteral("data") && mRequest->SameOriginDataURL()) ||
scheme.EqualsLiteral("about")) {
// We have to manually check about:blank here since it's not treated as
// an inheriting URL by CheckMayLoad.
if (!mCORSFlagEverSet &&
(NS_IsAboutBlank(requestURI) ||
NS_SUCCEEDED(mPrincipal->CheckMayLoad(requestURI, false /* report */,
true /*allowIfInheritsPrincipal*/)))) {
return MainFetchOp(BASIC_FETCH);
}