diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-01 15:54:01 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-02 14:07:43 +0000 |
| commit | 0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1 (patch) | |
| tree | f3d0b92fe7bc5b31426a838c354616fff335e82b /Source/WebCore/loader/DocumentThreadableLoader.cpp | |
| parent | 881da28418d380042aa95a97f0cbd42560a64f7c (diff) | |
| download | qtwebkit-0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1.tar.gz | |
Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31
Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Source/WebCore/loader/DocumentThreadableLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/DocumentThreadableLoader.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebCore/loader/DocumentThreadableLoader.cpp b/Source/WebCore/loader/DocumentThreadableLoader.cpp index 63cf08d01..731d2e844 100644 --- a/Source/WebCore/loader/DocumentThreadableLoader.cpp +++ b/Source/WebCore/loader/DocumentThreadableLoader.cpp @@ -401,8 +401,12 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, Secur ResourceError error; ResourceResponse response; unsigned long identifier = std::numeric_limits<unsigned long>::max(); - if (m_document.frame()) - identifier = m_document.frame()->loader().loadResourceSynchronously(request, m_options.allowCredentials(), m_options.clientCredentialPolicy(), error, response, data); + if (m_document.frame()) { + auto& frameLoader = m_document.frame()->loader(); + if (!frameLoader.mixedContentChecker().canRunInsecureContent(m_document.securityOrigin(), requestURL)) + return; + identifier = frameLoader.loadResourceSynchronously(request, m_options.allowCredentials(), m_options.clientCredentialPolicy(), error, response, data); + } if (!error.isNull() && response.httpStatusCode() <= 0) { if (requestURL.isLocalFile()) { |