[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.21-1-3-g0f612ab

Gustavo Noronha Silva kov at debian.org
Mon Feb 15 20:41:16 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit 612280ce94a8f317b538450edb4fce2d95810755
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 20:35:55 2010 +0000

    2010-02-15 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            [GTK] Crashes when going back to a page that has data: URIs, with page cache enabled
            https://bugs.webkit.org/show_bug.cgi?id=34944
    
            Set the URL in the newly created response, when parsing data:
            URIs.
    
            Test: fast/harness/page-cache-crash-on-data-urls.html
    
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::parseDataUrl):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index ee8e7aa..9a315cd 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -380,6 +380,7 @@ static gboolean parseDataUrl(gpointer callback_data)
     String charset = extractCharsetFromMediaType(mediaType);
 
     ResourceResponse response;
+    response.setURL(handle->request().url());
     response.setMimeType(mimeType);
 
     if (isBase64) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list