[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[otte at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 26d3e29306290cf53debf8cf67860f617e368729
Author: otte at webkit.org <otte at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 10:51:35 2009 +0000

    Remove the fragment identifier from url before passing it to libsoup.
    
    In newer releases libsoup emits a warning when it gets handed a
    fragment.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7df8a9f..320f33c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+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 5a229b8..0b4ed2c 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -467,12 +467,7 @@ static bool startHttp(ResourceHandle* handle)
 
     ResourceHandleInternal* d = handle->getInternal();
 
-    ResourceRequest request(handle->request());
-    KURL url(request.url());
-    url.removeFragmentIdentifier();
-    request.setURL(url);
-
-    d->m_msg = request.toSoupMessage();
+    d->m_msg = d->m_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 0d4e0f9..860ac0d 100644
--- a/WebCore/platform/network/soup/ResourceRequestSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceRequestSoup.cpp
@@ -32,7 +32,9 @@ namespace WebCore {
 
 SoupMessage* ResourceRequest::toSoupMessage() const
 {
-    SoupMessage* soupMessage = soup_message_new(httpMethod().utf8().data(), url().string().utf8().data());
+    KURL noFragment = url();
+    noFragment.removeFragmentIdentifier();
+    SoupMessage* soupMessage = soup_message_new(httpMethod().utf8().data(), noFragment.string().utf8().data());
     if (!soupMessage)
         return 0;
 

-- 
WebKit Debian packaging