Index: Source/core/loader/MixedContentChecker.cpp |
diff --git a/Source/core/loader/MixedContentChecker.cpp b/Source/core/loader/MixedContentChecker.cpp |
index 874f22b5661c3f2bfb6cfbf274d1f1dfddbee490..af7f992b2390a1bb4410b2da8fdb9f542b94d2ea 100644 |
--- a/Source/core/loader/MixedContentChecker.cpp |
+++ b/Source/core/loader/MixedContentChecker.cpp |
@@ -73,13 +73,14 @@ bool MixedContentChecker::canDisplayInsecureContent(SecurityOrigin* securityOrig |
return allowed; |
} |
-bool MixedContentChecker::canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const |
+bool MixedContentChecker::canRunInsecureContentInternal(SecurityOrigin* securityOrigin, const KURL& url, bool isWebSocket) const |
{ |
if (!isMixedContent(securityOrigin, url)) |
return true; |
Settings* settings = m_frame->settings(); |
- bool allowed = client()->allowRunningInsecureContent(settings && settings->allowRunningOfInsecureContent(), securityOrigin, url); |
+ bool allowedPerSettings = settings && (settings->allowRunningOfInsecureContent() || (isWebSocket && settings->allowConnectingInsecureWebSocket())); |
+ bool allowed = client()->allowRunningInsecureContent(allowedPerSettings, securityOrigin, url); |
logWarning(allowed, "ran", url); |
if (allowed) |