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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e2bddf63831d943b64863e13ad4675ad4ec7d533
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 19:14:36 2009 +0000

    2009-12-16  Dan Winship  <danw at gnome.org>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Gtk] Content-Encoding support
    
            https://bugs.webkit.org/show_bug.cgi?id=522772
    
            * configure.ac: require libsoup 2.28.2 for SoupContentDecoder
    2009-12-16  Dan Winship  <danw at gnome.org>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Gtk] Content-Encoding support
    
            https://bugs.webkit.org/show_bug.cgi?id=522772
    
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::startHttp): Don't force "Accept-Encoding: identity" any
            more
    2009-12-16  Dan Winship  <danw at gnome.org>
    
            Reviewed by Gustavo Noronha Silva.
    
            Content-Encoding support
    
            https://bugs.webkit.org/show_bug.cgi?id=522772
    
            * webkit/webkitprivate.cpp:
            (webkit_init): add a SoupContentDecoder feature to the session
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 98d5de4..55aefed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-16  Dan Winship  <danw at gnome.org>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Gtk] Content-Encoding support
+
+        https://bugs.webkit.org/show_bug.cgi?id=522772
+
+        * configure.ac: require libsoup 2.28.2 for SoupContentDecoder
+
 2009-12-13  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3875a87..cb6e41c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-16  Dan Winship  <danw at gnome.org>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Gtk] Content-Encoding support
+
+        https://bugs.webkit.org/show_bug.cgi?id=522772
+
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::startHttp): Don't force "Accept-Encoding: identity" any
+        more
+
 2009-12-16  Benjamin Otte  <otte at gnome.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index 6367a3e..5a229b8 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -548,12 +548,6 @@ static bool startHttp(ResourceHandle* handle)
     // balanced by a deref() in finishedCallback, which should always run
     handle->ref();
 
-    // FIXME: For now, we cannot accept content encoded in anything
-    // other than identity, so force servers to do it our way. When
-    // libsoup gets proper Content-Encoding support we will want to
-    // use it here instead.
-    soup_message_headers_replace(d->m_msg->request_headers, "Accept-Encoding", "identity");
-
     // Balanced in ResourceHandleInternal's destructor; we need to
     // keep our own ref, because after queueing the message, the
     // session owns the initial reference.
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 0d8c12e..e66cf0e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-16  Dan Winship  <danw at gnome.org>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Content-Encoding support
+
+        https://bugs.webkit.org/show_bug.cgi?id=522772
+
+        * webkit/webkitprivate.cpp:
+        (webkit_init): add a SoupContentDecoder feature to the session
+
 2009-12-16  Christian Dywan  <christian at twotoasts.de>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index c80160c..95a5717 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -280,6 +280,8 @@ void webkit_init()
     SoupSessionFeature* sniffer = static_cast<SoupSessionFeature*>(g_object_new(SOUP_TYPE_CONTENT_SNIFFER, NULL));
     soup_session_add_feature(session, sniffer);
     g_object_unref(sniffer);
+
+    soup_session_add_feature_by_type(session, SOUP_TYPE_CONTENT_DECODER);
 }
 
 void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains)
diff --git a/configure.ac b/configure.ac
index d2877c0..7399ce6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ if test "$with_hildon" = "yes"; then
 fi
 
 # minimum base dependencies
-LIBSOUP_REQUIRED_VERSION=2.27.91
+LIBSOUP_REQUIRED_VERSION=2.28.2
 CAIRO_REQUIRED_VERSION=1.6
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0

-- 
WebKit Debian packaging