| Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
|
| index 057990a8b4c0e59c43877dde79d92343fef63910..6d61e4280ab7afcd2aa44af3338f61fca5513c72 100644
|
| --- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
|
| @@ -161,7 +161,6 @@ DocumentThreadableLoader::DocumentThreadableLoader(
|
| m_forceDoNotAllowStoredCredentials(false),
|
| m_securityOrigin(m_resourceLoaderOptions.securityOrigin),
|
| m_sameOriginRequest(false),
|
| - m_crossOriginNonSimpleRequest(false),
|
| m_isUsingDataConsumerHandle(false),
|
| m_async(blockingBehavior == LoadAsynchronously),
|
| m_requestContext(WebURLRequest::RequestContextUnspecified),
|
| @@ -386,8 +385,6 @@ void DocumentThreadableLoader::makeCrossOriginAccessRequest(
|
| prepareCrossOriginRequest(crossOriginRequest);
|
| loadRequest(crossOriginRequest, crossOriginOptions);
|
| } else {
|
| - m_crossOriginNonSimpleRequest = true;
|
| -
|
| bool shouldForcePreflight =
|
| request.isExternalRequest() ||
|
| InspectorInstrumentation::shouldForceCORSPreflight(m_document);
|
| @@ -572,16 +569,8 @@ bool DocumentThreadableLoader::redirectReceived(
|
| bool allowRedirect = false;
|
| String accessControlErrorDescription;
|
|
|
| - if (m_crossOriginNonSimpleRequest) {
|
| - // Non-simple cross origin requests (both preflight and actual one) are not
|
| - // allowed to follow redirect.
|
| - accessControlErrorDescription =
|
| - "Redirect from '" + redirectResponse.url().getString() + "' to '" +
|
| - request.url().getString() +
|
| - "' has been blocked by CORS policy: Request requires preflight, which "
|
| - "is disallowed to follow cross-origin redirect.";
|
| - } else if (!CrossOriginAccessControl::isLegalRedirectLocation(
|
| - request.url(), accessControlErrorDescription)) {
|
| + if (!CrossOriginAccessControl::isLegalRedirectLocation(
|
| + request.url(), accessControlErrorDescription)) {
|
| accessControlErrorDescription =
|
| "Redirect from '" + redirectResponse.url().getString() +
|
| "' has been blocked by CORS policy: " + accessControlErrorDescription;
|
|
|