diff options
| author | Steve Block <steveblock@google.com> | 2011-10-20 10:31:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-20 10:31:48 -0700 |
| commit | bb69a7f55a98c757dd11b672c43dae435eccdd0a (patch) | |
| tree | 5b67be93036b29c5d77c816cdc47c24b8b4db3df /Source/WebCore/loader/FrameLoader.cpp | |
| parent | 93c9c11cdf5ac04caadeabd190590383d08e8808 (diff) | |
| parent | 1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2 (diff) | |
| download | external_webkit-bb69a7f55a98c757dd11b672c43dae435eccdd0a.zip external_webkit-bb69a7f55a98c757dd11b672c43dae435eccdd0a.tar.gz external_webkit-bb69a7f55a98c757dd11b672c43dae435eccdd0a.tar.bz2 | |
Merge "Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation"
Diffstat (limited to 'Source/WebCore/loader/FrameLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/FrameLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp index 2def2a6..85b1541 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -2743,7 +2743,7 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp request.setCachePolicy(UseProtocolCachePolicy); } else if (loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadFromOrigin || request.isConditional()) request.setCachePolicy(ReloadIgnoringCacheData); - else if (isBackForwardLoadType(loadType) && m_stateMachine.committedFirstRealDocumentLoad() && !request.url().protocolIs("https")) + else if (isBackForwardLoadType(loadType) && m_stateMachine.committedFirstRealDocumentLoad()) request.setCachePolicy(ReturnCacheDataElseLoad); if (request.cachePolicy() == ReloadIgnoringCacheData) { |