| Index: Source/core/fetch/ResourceLoader.cpp
|
| diff --git a/Source/core/fetch/ResourceLoader.cpp b/Source/core/fetch/ResourceLoader.cpp
|
| index 0d2d6c42ed04fc51e7f457bb0548394533e55709..78c65a21070db6ccc4c745c8d6397759e3c6436c 100644
|
| --- a/Source/core/fetch/ResourceLoader.cpp
|
| +++ b/Source/core/fetch/ResourceLoader.cpp
|
| @@ -263,10 +263,11 @@ void ResourceLoader::willSendRequest(blink::WebURLLoader*, blink::WebURLRequest&
|
| ASSERT(!request.isNull());
|
| const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceResponse());
|
| ASSERT(!redirectResponse.isNull());
|
| - if (!m_host->shouldRequest(m_resource, request, m_options)) {
|
| + if (!m_host->canAccessRedirect(m_resource, request, redirectResponse, m_options)) {
|
| cancel();
|
| return;
|
| }
|
| +
|
| m_host->redirectReceived(m_resource, redirectResponse);
|
| m_resource->willSendRequest(request, redirectResponse);
|
| if (request.isNull() || m_state == Terminated)
|
| @@ -321,7 +322,7 @@ void ResourceLoader::didReceiveResponse(blink::WebURLLoader*, const blink::WebUR
|
| resource = m_resource->resourceToRevalidate();
|
| else
|
| m_resource->setResponse(resourceResponse);
|
| - if (!m_host->canAccessResource(resource, response.url())) {
|
| + if (!m_host->canAccessResource(resource, m_options.securityOrigin.get(), response.url())) {
|
| cancel();
|
| return;
|
| }
|
|
|