зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1152574 - Do not report aborted XHR requests in web console. r=sicking
This commit is contained in:
Родитель
697fd30045
Коммит
6b484e43cd
|
@ -6,7 +6,6 @@ BlockMixedActiveContent = Blocked loading mixed active content "%1$S"
|
||||||
# CORS
|
# CORS
|
||||||
# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
|
# LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
|
||||||
CORSDisabled=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS disabled).
|
CORSDisabled=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS disabled).
|
||||||
CORSRequestFailed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request failed).
|
|
||||||
CORSRequestNotHttp=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request not http).
|
CORSRequestNotHttp=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request not http).
|
||||||
CORSMissingAllowOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' missing).
|
CORSMissingAllowOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' missing).
|
||||||
CORSAllowOriginNotMatchingOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' does not match '%2$S').
|
CORSAllowOriginNotMatchingOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' does not match '%2$S').
|
||||||
|
|
|
@ -538,14 +538,8 @@ nsCORSListenerProxy::CheckRequestApproved(nsIRequest* aRequest)
|
||||||
// Check if the request failed
|
// Check if the request failed
|
||||||
nsresult status;
|
nsresult status;
|
||||||
nsresult rv = aRequest->GetStatus(&status);
|
nsresult rv = aRequest->GetStatus(&status);
|
||||||
if (NS_FAILED(rv)) {
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
LogBlockedRequest(aRequest, "CORSRequestFailed", nullptr);
|
NS_ENSURE_SUCCESS(status, status);
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
if (NS_FAILED(status)) {
|
|
||||||
LogBlockedRequest(aRequest, "CORSRequestFailed", nullptr);
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test that things worked on a HTTP level
|
// Test that things worked on a HTTP level
|
||||||
nsCOMPtr<nsIHttpChannel> http = do_QueryInterface(aRequest);
|
nsCOMPtr<nsIHttpChannel> http = do_QueryInterface(aRequest);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче