[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:30:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a948cfe4c229006c6ec6a687cb76495b182808ab
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 24 20:02:41 2010 +0000
2010-11-24 Nicolas Dufresne <nicolas.dufresne at collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] response.isNull() assert when using directory file URI
https://bugs.webkit.org/show_bug.cgi?id=49018
When using file:/// (or any directory), WebKitGTK use to abort on
assertion. This test ensure that loading a directory is possible.
* platform/gtk/fast/loader/crash-display-local-directory-expected.txt: Added.
* platform/gtk/fast/loader/crash-display-local-directory.html: Added.
* platform/gtk/fast/loader/resources/directory/keep-empty: Added.
2010-11-24 Nicolas Dufresne <nicolas.dufresne at collabora.co.uk>
Reviewed by Martin Robinson.
[GTK] response.isNull() assert when using directory file URI
https://bugs.webkit.org/show_bug.cgi?id=49018
Do ensure that didReceiveResponse happens before any call to
didReceiveData. That was not true for file:// URIs pointing to
directories and thus was triggering an assertion.
Test: platform/gtk/fast/loader/crash-display-local-directory.html
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::gotHeadersCallback):
(WebCore::contentSniffedCallback):
(WebCore::parseDataUrl):
(WebCore::sendRequestCallback):
(WebCore::readCallback):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72695 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f9493e1..8adbd1d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-24 Nicolas Dufresne <nicolas.dufresne at collabora.co.uk>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] response.isNull() assert when using directory file URI
+ https://bugs.webkit.org/show_bug.cgi?id=49018
+
+ When using file:/// (or any directory), WebKitGTK use to abort on
+ assertion. This test ensure that loading a directory is possible.
+
+ * platform/gtk/fast/loader/crash-display-local-directory-expected.txt: Added.
+ * platform/gtk/fast/loader/crash-display-local-directory.html: Added.
+ * platform/gtk/fast/loader/resources/directory/keep-empty: Added.
+
2010-11-24 Andrey Kosyakov <caseq at chromium.org>
Unreviewed, update platform expectations following expectations change in r72683.
diff --git a/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory-expected.txt b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory-expected.txt
new file mode 100644
index 0000000..c54eb5e
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory-expected.txt
@@ -0,0 +1,5 @@
+This test is to see if a local directory index can be diplayed.
+
+PASS: Local directory loaded.
+
+
diff --git a/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
new file mode 100644
index 0000000..7fa0cb9
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/loader/crash-display-local-directory.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+ <title>Test crash on directory display</title>
+ <script>
+ function directoryTest() {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ var result = document.getElementById("result");
+
+ var directoryDocument = document.getElementById("myDirectory").contentDocument;
+ if (directoryDocument)
+ result.innerHTML = "PASS: Local directory loaded.";
+ else
+ result.innerHTML = "FAIL: Local directory cannot be listed.";
+ }
+ </script>
+</head>
+<body>
+ <p>This test is to see if a local directory index can be diplayed.</p>
+ <p id="result">
+ Test has not run.
+ </p>
+ <iframe id="myDirectory" src="resources/directory" width="600px" height="400px" onload="directoryTest()"/>
+</body>
+</html>
diff --git a/LayoutTests/platform/gtk/fast/loader/resources/directory/keep-empty b/LayoutTests/platform/gtk/fast/loader/resources/directory/keep-empty
new file mode 100644
index 0000000..a209a12
--- /dev/null
+++ b/LayoutTests/platform/gtk/fast/loader/resources/directory/keep-empty
@@ -0,0 +1,2 @@
+This directory is used by platform/gtk/fast/loader/crash-display-local-directory.html
+Please don't add anything into this directory.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e498e54..d95caa0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-24 Nicolas Dufresne <nicolas.dufresne at collabora.co.uk>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] response.isNull() assert when using directory file URI
+ https://bugs.webkit.org/show_bug.cgi?id=49018
+
+ Do ensure that didReceiveResponse happens before any call to
+ didReceiveData. That was not true for file:// URIs pointing to
+ directories and thus was triggering an assertion.
+
+ Test: platform/gtk/fast/loader/crash-display-local-directory.html
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::gotHeadersCallback):
+ (WebCore::contentSniffedCallback):
+ (WebCore::parseDataUrl):
+ (WebCore::sendRequestCallback):
+ (WebCore::readCallback):
+
2010-11-24 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 0f97867..e578a8d 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -245,6 +245,8 @@ static void gotHeadersCallback(SoupMessage* msg, gpointer data)
if (!client)
return;
+ ASSERT(d->m_response.isNull());
+
fillResponseFromMessage(msg, &d->m_response);
client->didReceiveResponse(handle.get(), d->m_response);
}
@@ -272,6 +274,8 @@ static void contentSniffedCallback(SoupMessage* msg, const char* sniffedType, GH
if (!client)
return;
+ ASSERT(d->m_response.isNull());
+
fillResponseFromMessage(msg, &d->m_response);
client->didReceiveResponse(handle.get(), d->m_response);
}
@@ -291,6 +295,8 @@ static void gotChunkCallback(SoupMessage* msg, SoupBuffer* chunk, gpointer data)
if (!client)
return;
+ ASSERT(!d->m_response.isNull());
+
client->didReceiveData(handle.get(), chunk->data, chunk->length, false);
}
@@ -329,14 +335,15 @@ static gboolean parseDataUrl(gpointer callbackData)
String mimeType = extractMIMETypeFromMediaType(mediaType);
String charset = extractCharsetFromMediaType(mediaType);
- ResourceResponse response;
- response.setURL(handle->firstRequest().url());
- response.setMimeType(mimeType);
+ ASSERT(d->m_response.isNull());
+
+ d->m_response.setURL(handle->firstRequest().url());
+ d->m_response.setMimeType(mimeType);
// For non base64 encoded data we have to convert to UTF-16 early
// due to limitations in KURL
- response.setTextEncodingName(isBase64 ? charset : "UTF-16");
- client->didReceiveResponse(handle, response);
+ d->m_response.setTextEncodingName(isBase64 ? charset : "UTF-16");
+ client->didReceiveResponse(handle, d->m_response);
// The load may be cancelled, and the client may be destroyed
// by any of the client reporting calls, so we check, and bail
@@ -496,6 +503,8 @@ static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer use
}
if (d->m_soupMessage && statusWillBeHandledBySoup(d->m_soupMessage->status_code)) {
+ ASSERT(d->m_response.isNull());
+
fillResponseFromMessage(soupMsg, &d->m_response);
client->didReceiveResponse(handle.get(), d->m_response);
@@ -526,18 +535,14 @@ static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer use
// readCallback needs it
g_object_set_data(G_OBJECT(d->m_inputStream.get()), "webkit-resource", handle.get());
- // We need to check if it's a file: URL and if it is a regular
- // file as it could be a directory. In that case Soup properly
- // returns a stream whose content is a HTML with a list of files
- // in the directory
- if (equalIgnoringCase(handle->firstRequest().url().protocol(), "file")
- && G_IS_FILE_INPUT_STREAM(in)) {
- ResourceResponse response;
-
- response.setURL(handle->firstRequest().url());
- response.setMimeType(webkit_soup_request_get_content_type(d->m_soupRequest.get()));
- response.setExpectedContentLength(webkit_soup_request_get_content_length(d->m_soupRequest.get()));
- client->didReceiveResponse(handle.get(), response);
+ // Ensure a response is sent for any protocols that don't explicitly support responses
+ // through got-headers signal or content sniffing.
+ // (e.g. file and GIO based protocol).
+ if (!handle->shouldContentSniff() && d->m_response.isNull()) {
+ d->m_response.setURL(handle->firstRequest().url());
+ d->m_response.setMimeType(webkit_soup_request_get_content_type(d->m_soupRequest.get()));
+ d->m_response.setExpectedContentLength(webkit_soup_request_get_content_length(d->m_soupRequest.get()));
+ client->didReceiveResponse(handle.get(), d->m_response);
if (d->m_cancelled) {
cleanupSoupRequestOperation(handle.get());
@@ -813,6 +818,9 @@ static void readCallback(GObject* source, GAsyncResult* asyncResult, gpointer da
return;
}
+ // It's mandatory to have sent a response before sending data
+ ASSERT(!d->m_response.isNull());
+
d->m_total += bytesRead;
if (G_LIKELY(!convertToUTF16))
client->didReceiveData(handle.get(), d->m_buffer, bytesRead, d->m_total);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list