Title: [140737] branches/chromium/1364/Source/WebCore/loader/SubresourceLoader.cpp
- Revision
- 140737
- Author
- [email protected]
- Date
- 2013-01-24 15:25:45 -0800 (Thu, 24 Jan 2013)
Log Message
Merge 139551
BUG=163218
Review URL: https://codereview.chromium.org/12039077
Modified Paths
Diff
Modified: branches/chromium/1364/Source/WebCore/loader/SubresourceLoader.cpp (140736 => 140737)
--- branches/chromium/1364/Source/WebCore/loader/SubresourceLoader.cpp 2013-01-24 23:23:27 UTC (rev 140736)
+++ branches/chromium/1364/Source/WebCore/loader/SubresourceLoader.cpp 2013-01-24 23:25:45 UTC (rev 140737)
@@ -213,6 +213,8 @@
void SubresourceLoader::didReceiveData(const char* data, int length, long long encodedDataLength, bool allAtOnce)
{
+ if (m_resource->response().httpStatusCode() >= 400 && !m_resource->shouldIgnoreHTTPStatusCodeErrors())
+ return;
ASSERT(!m_resource->resourceToRevalidate());
ASSERT(!m_resource->errorOccurred());
ASSERT(m_state == Initialized);
@@ -231,8 +233,8 @@
if (m_resource->response().httpStatusCode() < 400 || m_resource->shouldIgnoreHTTPStatusCodeErrors())
return false;
+ m_state = Finishing;
m_resource->error(CachedResource::LoadError);
- m_state = Finishing;
cancel();
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
