diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc b/chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc index bf57d173478..a416644e20d 100644 --- a/chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc +++ b/chromium/third_party/blink/renderer/modules/websockets/websocket_common.cc @@ -7,15 +7,15 @@ #include <stddef.h> #include "base/metrics/histogram_macros.h" -#include "third_party/blink/public/platform/web_insecure_request_policy.h" +#include "third_party/blink/public/common/security_context/insecure_request_policy.h" +#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/execution_context/security_context.h" #include "third_party/blink/renderer/core/frame/csp/content_security_policy.h" #include "third_party/blink/renderer/core/loader/mixed_content_checker.h" +#include "third_party/blink/renderer/modules/websockets/websocket_channel.h" #include "third_party/blink/renderer/platform/bindings/exception_state.h" #include "third_party/blink/renderer/platform/instrumentation/use_counter.h" - -#include "third_party/blink/renderer/modules/websockets/websocket_channel.h" #include "third_party/blink/renderer/platform/weborigin/known_ports.h" #include "third_party/blink/renderer/platform/weborigin/security_origin.h" #include "third_party/blink/renderer/platform/wtf/assertions.h" @@ -41,8 +41,9 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect( url_ = KURL(NullURL(), url); bool upgrade_insecure_requests_set = - execution_context->GetSecurityContext().GetInsecureRequestPolicy() & - kUpgradeInsecureRequests; + (execution_context->GetSecurityContext().GetInsecureRequestPolicy() & + mojom::blink::InsecureRequestPolicy::kUpgradeInsecureRequests) != + mojom::blink::InsecureRequestPolicy::kLeaveInsecureRequestsAlone; if (upgrade_insecure_requests_set && url_.Protocol() == "ws" && !SecurityOrigin::Create(url_)->IsPotentiallyTrustworthy()) { |