Source/modules/websockets/DocumentWebSocketChannel.cpp - Issue 842783002: Mixed Content: Add a static check for WebSockets.

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/DocumentWebSocketChannel.cpp

Issue 842783002: Mixed Content: Add a static check for WebSockets. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@lax

Patch Set: Rebase. Created 5 years, 11 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:

Index: Source/modules/websockets/DocumentWebSocketChannel.cpp

diff --git a/Source/modules/websockets/DocumentWebSocketChannel.cpp b/Source/modules/websockets/DocumentWebSocketChannel.cpp

index ff920bf40c0765c5c175d9caa0b2f8ab9147a8e5..458b4f6e771ce1586da64d69a38ec622f9f476f2 100644

--- a/Source/modules/websockets/DocumentWebSocketChannel.cpp

+++ b/Source/modules/websockets/DocumentWebSocketChannel.cpp

@@ -137,7 +137,7 @@ bool DocumentWebSocketChannel::connect(const KURL& url, const String& protocol)

return false;

if (executionContext()->isDocument() && document()->frame()) {

- if (!document()->frame()->loader().mixedContentChecker()->canConnectInsecureWebSocket(document()->securityOrigin(), url))

+ if (MixedContentChecker::shouldBlockConnection(document()->frame(), url))

return false;

}

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