third_party/WebKit/Source/core/loader/MixedContentChecker.cpp - Issue 1931063004: Stop blocking 'http://127.0.0.1/' as mixed content.

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: third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

Issue 1931063004: Stop blocking 'http://127.0.0.1/' as mixed content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« third_party/WebKit/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt ('K') | « third_party/WebKit/LayoutTests/http/tests/security/mixedContent/websocket/resources/expect-throw-on-construction.js ('k') | third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

diff --git a/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp b/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

index effce10dc0bf0b6db71129c7f1e2a7c1b2b6ebf1..81b0a26b225f3e26f491acbd5b8dcda6d3d4e70f 100644

--- a/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

+++ b/third_party/WebKit/Source/core/loader/MixedContentChecker.cpp

@@ -87,8 +87,9 @@ bool MixedContentChecker::isMixedContent(SecurityOrigin* securityOrigin, const K

if (!SchemeRegistry::shouldTreatURLSchemeAsRestrictingMixedContent(securityOrigin->protocol()))

return false;

- // We're in a secure context, so |url| is mixed content if it's insecure.

- return !SecurityOrigin::isSecure(url);

+ // |url| is mixed content if its origin is not potentially trustworthy, and

+ // its protocol is not 'data'.

+ return !(SecurityOrigin::create(url)->isPotentiallyTrustworthy() || url.protocolIsData());

}

// static