Merge 139551

Source/WebCore/loader/SubresourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 195 matching lines @@
         // After the first multipart section is complete, signal to delegates that this load is "finished" 
         m_documentLoader->subresourceLoaderFinishedLoadingOnePart(this);
         didFinishLoadingOnePart(0);
     }
 
     checkForHTTPStatusCodeError();
 }
 
 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);
     // Reference the object in this method since the additional processing can do
     // anything including removing the last reference to this object; one example of this is 3266216.
     RefPtr<SubresourceLoader> protect(this);
     addData(data, length, allAtOnce);
     if (!m_loadingMultipartContent)
         sendDataToResource(data, length);
     if (shouldSendResourceLoadCallbacks() && m_frame)
         frameLoader()->notifier()->didReceiveData(this, data, length, static_cast<int>(encodedDataLength));
 }
 
 bool SubresourceLoader::checkForHTTPStatusCodeError()
 {
     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;
 }
 
 void SubresourceLoader::sendDataToResource(const char* data, int length)
 {
     // There are two cases where we might need to create our own SharedBuffer instead of copying the one in ResourceLoader. 
     // (1) Multipart content: The loader delivers the data in a multipart section all at once, then sends eof. 
     //     The resource data will change as the next part is loaded, so we need to make a copy. 
     // (2) Our client requested that the data not be buffered at the ResourceLoader level via ResourceLoaderOptions. In this case, 
@@ skipping 72 matching lines @@
         m_documentLoader->cachedResourceLoader()->loadDone(m_resource);
         if (reachedTerminalState())
             return;
         m_resource->stopLoading();
         m_documentLoader->removeSubresourceLoader(this);
     }
     ResourceLoader::releaseResources();
 }
 
 }