Modified: trunk/LayoutTests/ChangeLog (100485 => 100486)
--- trunk/LayoutTests/ChangeLog 2011-11-16 19:59:12 UTC (rev 100485)
+++ trunk/LayoutTests/ChangeLog 2011-11-16 20:12:42 UTC (rev 100486)
@@ -1,3 +1,14 @@
+2011-11-16 Sergio Villar Senin <svil...@igalia.com>
+
+ [Soup] Somet tests fail with FAIL Unexpected response data received: Wrong method: GET
+ https://bugs.webkit.org/show_bug.cgi?id=69219
+
+ Reviewed by Martin Robinson.
+
+ Unskipped a test that now pass.
+
+ * platform/gtk/Skipped: unskipped http/tests/local/blob/send-hybrid-blob.html
+
2011-11-16 Steve Block <stevebl...@google.com>
fast/frames/sandboxed-iframe-navigation-targetlink.html crashes occasionally on Chromium Mac dbg
Modified: trunk/LayoutTests/platform/gtk/Skipped (100485 => 100486)
--- trunk/LayoutTests/platform/gtk/Skipped 2011-11-16 19:59:12 UTC (rev 100485)
+++ trunk/LayoutTests/platform/gtk/Skipped 2011-11-16 20:12:42 UTC (rev 100486)
@@ -1533,10 +1533,8 @@
# https://bugs.webkit.org/show_bug.cgi?id=69587
editing/pasteboard/smart-paste-008.html
-# Some tests fail with "FAIL Unexpected response data received: Wrong method: GET"
-# https://bugs.webkit.org/show_bug.cgi?id=69219
-http/tests/local/fileapi/send-sliced-dragged-file.html
-http/tests/local/blob/send-hybrid-blob.html
+# Fails because it does not throw a couple of expected exceptions
+http/tests/local/fileapi/send-sliced-dragged-file.html
# Microdata DOM API is not yet enabled.
fast/dom/MicroData
Modified: trunk/Source/WebCore/ChangeLog (100485 => 100486)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 19:59:12 UTC (rev 100485)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 20:12:42 UTC (rev 100486)
@@ -1,3 +1,16 @@
+2011-11-16 Sergio Villar Senin <svil...@igalia.com>
+
+ [Soup] Somet tests fail with FAIL Unexpected response data received: Wrong method: GET
+ https://bugs.webkit.org/show_bug.cgi?id=69219
+
+ Reviewed by Martin Robinson.
+
+ Do not stop appending data to the request body if any of the blob
+ items to upload is not accesible.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::addEncodedBlobToSoupMessageBody):
+
2011-11-16 Beth Dakin <bda...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=72400
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (100485 => 100486)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-11-16 19:59:12 UTC (rev 100485)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-11-16 20:12:42 UTC (rev 100486)
@@ -542,37 +542,34 @@
return fileModificationTime != static_cast<time_t>(blobItem.expectedModificationTime);
}
-static bool addEncodedBlobItemToSoupMessageBody(SoupMessage* message, const BlobDataItem& blobItem, unsigned long& totalBodySize)
+static void addEncodedBlobItemToSoupMessageBody(SoupMessage* message, const BlobDataItem& blobItem, unsigned long& totalBodySize)
{
if (blobItem.type == BlobDataItem::Data) {
totalBodySize += blobItem.length;
soup_message_body_append(message->request_body, SOUP_MEMORY_TEMPORARY,
blobItem.data->data() + blobItem.offset, blobItem.length);
- return true;
+ return;
}
ASSERT(blobItem.type == BlobDataItem::File);
if (blobIsOutOfDate(blobItem))
- return false;
+ return;
- return addFileToSoupMessageBody(message,
- blobItem.path,
- blobItem.offset,
- blobItem.length == BlobDataItem::toEndOfFile ? 0 : blobItem.length,
- totalBodySize);
+ addFileToSoupMessageBody(message,
+ blobItem.path,
+ blobItem.offset,
+ blobItem.length == BlobDataItem::toEndOfFile ? 0 : blobItem.length,
+ totalBodySize);
}
-static bool addEncodedBlobToSoupMessageBody(SoupMessage* message, const FormDataElement& element, unsigned long& totalBodySize)
+static void addEncodedBlobToSoupMessageBody(SoupMessage* message, const FormDataElement& element, unsigned long& totalBodySize)
{
RefPtr<BlobStorageData> blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(KURL(ParsedURLString, element.m_blobURL));
if (!blobData)
- return true;
+ return;
for (size_t i = 0; i < blobData->items().size(); ++i)
- if (!addEncodedBlobItemToSoupMessageBody(message, blobData->items()[i], totalBodySize))
- return false;
-
- return true;
+ addEncodedBlobItemToSoupMessageBody(message, blobData->items()[i], totalBodySize);
}
#endif // ENABLE(BLOB)
@@ -602,8 +599,7 @@
#if ENABLE(BLOB)
ASSERT(element.m_type == FormDataElement::encodedBlob);
- if (!addEncodedBlobToSoupMessageBody(message, element, totalBodySize))
- return false;
+ addEncodedBlobToSoupMessageBody(message, element, totalBodySize);
#endif
}
return true;
