[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 59766c7d741f7d798c273bbff9e3521423ba4f91
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 13:38:22 2009 +0000

    Revert r52305, since it breaks many http tests. We will try a better
    solution for Soup.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 320f33c..7df8a9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,18 +1,3 @@
-2009-12-18  Benjamin Otte  <otte at gnome.org>
-
-        Reviewed by Gustavo Noronha Silva.
-
-        Remove the fragment identifier from url before passing it to libsoup.
-
-        In newer releases libsoup emits a warning when it gets handed a
-        fragment.
-
-        * platform/network/soup/ResourceRequestSoup.cpp:
-        (WebCore::ResourceRequest::toSoupMessage):
-        * platform/network/soup/ResourceHandleSoup.cpp:
-        (WebCore::startHttp): Remove old code trying to work around this
-        issue.
-
 2009-12-18  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 0b4ed2c..5a229b8 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -467,7 +467,12 @@ static bool startHttp(ResourceHandle* handle)
 
     ResourceHandleInternal* d = handle->getInternal();
 
-    d->m_msg = d->m_request.toSoupMessage();
+    ResourceRequest request(handle->request());
+    KURL url(request.url());
+    url.removeFragmentIdentifier();
+    request.setURL(url);
+
+    d->m_msg = request.toSoupMessage();
     if (!d->m_msg)
         return false;
 
diff --git a/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
index 860ac0d..0d4e0f9 100644
--- a/WebCore/platform/network/soup/ResourceRequestSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
@@ -32,9 +32,7 @@ namespace WebCore {
 
 SoupMessage* ResourceRequest::toSoupMessage() const
 {
-    KURL noFragment = url();
-    noFragment.removeFragmentIdentifier();
-    SoupMessage* soupMessage = soup_message_new(httpMethod().utf8().data(), noFragment.string().utf8().data());
+    SoupMessage* soupMessage = soup_message_new(httpMethod().utf8().data(), url().string().utf8().data());
     if (!soupMessage)
         return 0;
 

-- 
WebKit Debian packaging