diff options
| author | Steve Block <steveblock@google.com> | 2011-10-19 16:56:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-10-19 17:47:06 +0100 |
| commit | 1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2 (patch) | |
| tree | 88cb5bbb192096339f7d8d42a87fa85365e7a927 /Source/WebCore/loader/FrameLoader.cpp | |
| parent | 027e3e334d75a49172b7fe4392abdd7c06d1ae25 (diff) | |
| download | external_webkit-1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2.zip external_webkit-1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2.tar.gz external_webkit-1e986ec96b7ff9d1ee56e1063ebd99ee22bb1ce2.tar.bz2 | |
Cherry-pick WebKit change 89982 to allow secure pages to be loaded from the cache on back navigation
See http://trac.webkit.org/changeset/89982
Bug: 5480361
Change-Id: Ibaee251115eaa5c65e378d7ee9fe595fbf891c37
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) { |