[SCM] WebKit Debian packaging branch, debian/unstable, updated. upstream/1.1.6-150-gd07162c

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 4cff368e1200d5980fb9278a7c660c5faf526fc4
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 2 19:39:17 2009 +0000

    2009-05-02  Gustavo Noronha Silva  <gns at gnome.org>
    
            Reviewed by Holger Freyther.
    
            https://bugs.webkit.org/show_bug.cgi?id=25466
            WebKitGtk+ 1.1.6 prints weird error messages in Liferea
    
            Use strlen instead of g_utf8_strlen when calculating the size of
            the data that is being given to webkit_web_frame_load_string to be
            loaded, so that we don't miss any of the content.
    
            * webkit/webkitwebframe.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43146 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    filter-origin: 96eeed728dd3252f08cbfbab9b1d772fd01df5d9

diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 4e64be0..0cb3d31 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -416,7 +416,7 @@ static void webkit_web_frame_load_data(WebKitWebFrame* frame, const gchar* conte
 
     ResourceRequest request(baseKURL);
 
-    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(content, g_utf8_strlen(content, -1));
+    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(content, strlen(content));
     SubstituteData substituteData(sharedBuffer.release(),
                                   mimeType ? String::fromUTF8(mimeType) : String::fromUTF8("text/html"),
                                   encoding ? String::fromUTF8(encoding) : String::fromUTF8("UTF-8"),
diff --git a/debian/changelog b/debian/changelog
index 39a95b9..f177cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 webkit (1.1.6-1) UNRELEASED; urgency=low
 
+  [ Mike Hommey ]
   * New upstream release.
 
- -- Mike Hommey <glandium at debian.org>  Wed, 29 Apr 2009 07:18:40 +0200
+  [ Gustavo Noronha Silva ]
+  * Imported patch from upstream git mirror to avoid a regression in the
+    webkit_web_frame_load_string method.
+    See https://bugs.webkit.org/show_bug.cgi?id=25466
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Sun, 03 May 2009 16:25:12 -0300
 
 webkit (1.1.5-2) unstable; urgency=low
 

-- 
WebKit Debian packaging