Chromium Code Reviews| Index: Source/core/loader/DocumentThreadableLoader.cpp |
| diff --git a/Source/core/loader/DocumentThreadableLoader.cpp b/Source/core/loader/DocumentThreadableLoader.cpp |
| index 247f43c8bb743553d9e07826b945988685f3c213..c3e0a3ceb1a4ae68db7ddb744adb81b891403bab 100644 |
| --- a/Source/core/loader/DocumentThreadableLoader.cpp |
| +++ b/Source/core/loader/DocumentThreadableLoader.cpp |
| @@ -206,13 +206,18 @@ void DocumentThreadableLoader::redirectReceived(Resource* resource, ResourceRequ |
| // scheme and not contain the userinfo production. In addition, the redirect response must pass the access control check if the |
| // original request was not same-origin. |
| if (m_options.crossOriginRequestPolicy == UseAccessControl) { |
| + |
| + InspectorInstrumentation::didReceiveCORSRedirectResponse(m_document->frame(), resource->identifier(), m_document->frame()->loader()->documentLoader(), redirectResponse, 0, resource->loadFinishTime()); |
|
eustas
2013/08/28 09:43:25
I'm not sure that it is legal to use resource->loa
ancilgeorge
2013/08/28 14:05:11
I agree that finish time will not be updated in th
|
| + |
| bool allowRedirect = false; |
| + String accessControlErrorDescription; |
| if (m_simpleRequest) { |
| - String accessControlErrorDescription; |
| allowRedirect = SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(request.url().protocol()) |
| && request.url().user().isEmpty() |
| && request.url().pass().isEmpty() |
| && (m_sameOriginRequest || passesAccessControlCheck(redirectResponse, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription)); |
| + } else { |
| + accessControlErrorDescription = "Cross Origin Requests with preflight cannot be redirected"; |
| } |
| if (allowRedirect) { |
| @@ -243,9 +248,12 @@ void DocumentThreadableLoader::redirectReceived(Resource* resource, ResourceRequ |
| makeCrossOriginAccessRequest(request); |
| return; |
| } |
| - } |
| - m_client->didFailRedirectCheck(); |
| + ResourceError error(errorDomainWebKitInternal, 0, redirectResponse.url().string(), accessControlErrorDescription); |
| + m_client->didFailAccessControlCheck(error); |
| + } else { |
| + m_client->didFailRedirectCheck(); |
| + } |
| request = ResourceRequest(); |
| } |