Source/modules/websockets/MainThreadWebSocketChannel.cpp - Issue 605453002: Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..."

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/modules/websockets/MainThreadWebSocketChannel.cpp

Issue 605453002: Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2167/

Patch Set: Created 6 years, 3 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

Index: Source/modules/websockets/MainThreadWebSocketChannel.cpp

===================================================================

--- Source/modules/websockets/MainThreadWebSocketChannel.cpp (revision 182628)

+++ Source/modules/websockets/MainThreadWebSocketChannel.cpp (working copy)

@@ -94,7 +94,7 @@

ASSERT(!m_handle);

ASSERT(!m_suspended);

- if (MixedContentChecker::shouldBlockWebSocket(m_document->frame(), url))

+ if (m_document->frame() && !m_document->frame()->loader().mixedContentChecker()->canConnectInsecureWebSocket(m_document->securityOrigin(), url))

return false;

if (MixedContentChecker::isMixedContent(m_document->securityOrigin(), url)) {

String message = "Connecting to a non-secure WebSocket server from a secure origin is deprecated.";

« no previous file with comments | « Source/core/loader/PingLoader.cpp ('k') | Source/modules/websockets/NewWebSocketChannelImpl.cpp » ('j') | no next file with comments »