Source/core/loader/FrameFetchContext.cpp - Issue 1178093002: Correctly send the 'HTTPS' header for top-level navigations.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/loader/FrameFetchContext.cpp

Issue 1178093002: Correctly send the 'HTTPS' header for top-level navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Tests. Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/http/tests/security/upgrade-insecure-requests/resources/post-https-header.pl ('k') | Source/core/loader/FrameFetchContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameFetchContext.cpp

diff --git a/Source/core/loader/FrameFetchContext.cpp b/Source/core/loader/FrameFetchContext.cpp

index 2501a98aa347ef02edd9a98b3d57dce76dc00120..c83341fdd929bfa6798a8dd588a275de175624ea 100644

--- a/Source/core/loader/FrameFetchContext.cpp

+++ b/Source/core/loader/FrameFetchContext.cpp

@@ -580,9 +580,6 @@ String FrameFetchContext::charset() const

void FrameFetchContext::upgradeInsecureRequest(FetchRequest& fetchRequest)

{

- if (!m_document)

- return;

KURL url = fetchRequest.resourceRequest().url();

// Tack an 'HTTPS' header to outgoing navigational requests, as described in

@@ -590,7 +587,7 @@ void FrameFetchContext::upgradeInsecureRequest(FetchRequest& fetchRequest)

if (fetchRequest.resourceRequest().frameType() != WebURLRequest::FrameTypeNone)

fetchRequest.mutableResourceRequest().addHTTPHeaderField("HTTPS", "1");

- if (m_document->insecureRequestsPolicy() == SecurityContext::InsecureRequestsUpgrade && url.protocolIs("http")) {

+ if (m_document && m_document->insecureRequestsPolicy() == SecurityContext::InsecureRequestsUpgrade && url.protocolIs("http")) {

ASSERT(m_document->insecureNavigationsToUpgrade());

// We always upgrade requests that meet any of the following criteria: