Changeset 119759 in webkit
- Timestamp:
- Jun 7, 2012 3:08:53 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r119756 r119759 1 2012-06-07 Edaena Salinas Jasso <edaena@apple.com> 2 3 Should fire error event for empty 404 script 4 https://bugs.webkit.org/show_bug.cgi?id=50589 5 6 Reviewed by Brady Eidson. 7 8 Based on a test by Ojan Vafai. 9 10 * http/tests/loading/fire-error-event-empty-404-script-expected.txt: Added. 11 * http/tests/loading/fire-error-event-empty-404-script.html: Added. 12 * http/tests/loading/fire-error-event-script-no-content-type-expected.txt: Added. 13 * http/tests/loading/fire-error-event-script-no-content-type.html: Added. 14 * http/tests/loading/resources/404-with-empty-body-no-content-type.cgi: Added. 15 * http/tests/loading/resources/404-with-empty-body.cgi: Added. 16 * http/tests/resources/network-simulator.php: Fixed to no longer return 404 error 17 when logging a request. 18 1 19 2012-06-07 Ojan Vafai <ojan@chromium.org> 2 20 -
trunk/LayoutTests/http/tests/resources/network-simulator.php
r71196 r119759 153 153 // Documentation says that appends are atomic. 154 154 file_put_contents($resourceLogFile, $newData, FILE_APPEND); 155 generateResponse($path);156 155 } 157 156 -
trunk/Source/WebCore/ChangeLog
r119755 r119759 1 2012-06-07 Edaena Salinas Jasso <edaena@apple.com> 2 3 Should fire error event for empty 404 script 4 https://bugs.webkit.org/show_bug.cgi?id=50589 5 6 Reviewed by Brady Eidson. 7 8 Tests: 9 http/tests/loading/fire-error-event-empty-404-script.html 10 http/tests/loading/fire-error-script-no-content-type.html 11 12 * loader/SubresourceLoader.cpp: 13 (WebCore::SubresourceLoader::didReceiveResponse): We should check for http status 14 codes here to stop depending on the response being non-empty. 15 (WebCore::SubresourceLoader::didReceiveData): Moved the http status check but 16 avoid messing with multipart responses. 17 (WebCore::SubresourceLoader::checkForHTTPStatusCodeError): Renamed from 18 errorLoadingResource for clarity. 19 20 * loader/SubresourceLoader.h: 21 * loader/cf/SubresourceLoaderCF.cpp: 22 (WebCore::SubresourceLoader::didReceiveDataArray): 23 Updated for errorLoadingResource renaming. 24 1 25 2012-06-07 Konrad Piascik <kpiascik@rim.com> 2 26 -
trunk/Source/WebCore/loader/SubresourceLoader.cpp
r118618 r119759 210 210 didFinishLoadingOnePart(0); 211 211 } 212 213 checkForHTTPStatusCodeError(); 212 214 } 213 215 … … 222 224 ResourceLoader::didReceiveData(data, length, encodedDataLength, allAtOnce); 223 225 224 if ( errorLoadingResource() ||m_loadingMultipartContent)226 if (m_loadingMultipartContent) 225 227 return; 226 228 … … 228 230 } 229 231 230 bool SubresourceLoader:: errorLoadingResource()232 bool SubresourceLoader::checkForHTTPStatusCodeError() 231 233 { 232 234 if (m_resource->response().httpStatusCode() < 400 || m_resource->shouldIgnoreHTTPStatusCodeErrors()) -
trunk/Source/WebCore/loader/SubresourceLoader.h
r105226 r119759 73 73 virtual void releaseResources(); 74 74 75 bool errorLoadingResource();75 bool checkForHTTPStatusCodeError(); 76 76 void sendDataToResource(const char*, int); 77 77 -
trunk/Source/WebCore/loader/cf/SubresourceLoaderCF.cpp
r104407 r119759 37 37 ResourceLoader::didReceiveDataArray(dataArray); 38 38 39 if ( errorLoadingResource())39 if (checkForHTTPStatusCodeError()) 40 40 return; 41 41
Note: See TracChangeset
for help on using the changeset viewer.