mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:58:49 +00:00
Bug 1440775 - Make fetch API force-cache and only-if-cached use VALIDATE_NEVER instead of LOAD_FROM_CACHE. r=mayhemer, a=RyanVM
--HG-- extra : source : 60fb09de57ec145923da102f856399d3323f632b extra : amend_source : b42db87defcc5615773cfa4659af9ff5b9cd4b72 extra : intermediate-source : 599641c7992def734cb352d9413aa51bf0e9793f extra : histedit_source : 1d42c837225bdf000d3a68bef46a862be87d4044
This commit is contained in:
@@ -2480,9 +2480,9 @@ HttpBaseChannel::GetFetchCacheMode(uint32_t* aFetchCacheMode)
|
||||
*aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_RELOAD;
|
||||
} else if (mLoadFlags & VALIDATE_ALWAYS) {
|
||||
*aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_NO_CACHE;
|
||||
} else if (mLoadFlags & (LOAD_FROM_CACHE | nsICachingChannel::LOAD_ONLY_FROM_CACHE)) {
|
||||
} else if (mLoadFlags & (VALIDATE_NEVER | nsICachingChannel::LOAD_ONLY_FROM_CACHE)) {
|
||||
*aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_ONLY_IF_CACHED;
|
||||
} else if (mLoadFlags & LOAD_FROM_CACHE) {
|
||||
} else if (mLoadFlags & VALIDATE_NEVER) {
|
||||
*aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_FORCE_CACHE;
|
||||
} else {
|
||||
*aFetchCacheMode = nsIHttpChannelInternal::FETCH_CACHE_MODE_DEFAULT;
|
||||
@@ -2518,7 +2518,7 @@ HttpBaseChannel::SetFetchCacheMode(uint32_t aFetchCacheMode)
|
||||
break;
|
||||
case nsIHttpChannelInternal::FETCH_CACHE_MODE_FORCE_CACHE:
|
||||
// force-cache means don't validate unless if the response would vary.
|
||||
mLoadFlags |= LOAD_FROM_CACHE;
|
||||
mLoadFlags |= VALIDATE_NEVER;
|
||||
break;
|
||||
case nsIHttpChannelInternal::FETCH_CACHE_MODE_ONLY_IF_CACHED:
|
||||
// only-if-cached means only from cache, no network, no validation, generate
|
||||
@@ -2527,7 +2527,7 @@ HttpBaseChannel::SetFetchCacheMode(uint32_t aFetchCacheMode)
|
||||
// the user has things in their cache without any network traffic side
|
||||
// effects) are addressed in the Request constructor which enforces/requires
|
||||
// same-origin request mode.
|
||||
mLoadFlags |= LOAD_FROM_CACHE | nsICachingChannel::LOAD_ONLY_FROM_CACHE;
|
||||
mLoadFlags |= VALIDATE_NEVER | nsICachingChannel::LOAD_ONLY_FROM_CACHE;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user