[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 55a55dcb5e29443f2e08c8897d4f265c5fc23d48
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 21:38:55 2010 +0000

    2010-09-09  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] always send an Accept header
    
            Ensure QtWebKit always sends an Accept header. This is required
            for compatibility with sites that expect the header in requests
            for subresources.
    
            See https://bugs.webkit.org/show_bug.cgi?id=33242 for more.
    
            https://bugs.webkit.org/show_bug.cgi?id=45458
    
            * platform/qt/Skipped:
    2010-09-09  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] always send an Accept header
    
            Ensure QtWebKit always sends an Accept header. This is required
            for compatibility with sites that expect the header in requests
            for subresources.
    
            See https://bugs.webkit.org/show_bug.cgi?id=33242 for more.
    
            https://bugs.webkit.org/show_bug.cgi?id=45458
    
            * platform/network/qt/ResourceRequestQt.cpp:
            (WebCore::ResourceRequest::toNetworkRequest):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 32108e2..511b32c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-09  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] always send an Accept header
+
+        Ensure QtWebKit always sends an Accept header. This is required
+        for compatibility with sites that expect the header in requests
+        for subresources.
+
+        See https://bugs.webkit.org/show_bug.cgi?id=33242 for more.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45458
+
+        * platform/qt/Skipped:
+
 2010-09-09  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by James Robinson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 96d793e..433a254 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -144,10 +144,6 @@ http/tests/misc/bubble-drag-events.html
 # [Qt] http/tests/misc/slow-loading-mask.html timed out.
 http/tests/misc/slow-loading-mask.html
 
-# Qt may want to follow GTK+ in adding a default Accept header for
-# subresources. See https://bugs.webkit.org/show_bug.cgi?id=33242.
-http/tests/misc/image-checks-for-accept.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=35824 - Doesn't apply to platforms that don't enforce the CFNetwork-style 3rd party cookie policy
 http/tests/cookies/third-party-cookie-relaxing.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 546344f..f3696b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-09  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] always send an Accept header
+
+        Ensure QtWebKit always sends an Accept header. This is required
+        for compatibility with sites that expect the header in requests
+        for subresources.
+
+        See https://bugs.webkit.org/show_bug.cgi?id=33242 for more.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45458
+
+        * platform/network/qt/ResourceRequestQt.cpp:
+        (WebCore::ResourceRequest::toNetworkRequest):
+
 2010-09-09  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Chris Marrin.
diff --git a/WebCore/platform/network/qt/ResourceRequestQt.cpp b/WebCore/platform/network/qt/ResourceRequestQt.cpp
index 637c71f..4d576c7 100644
--- a/WebCore/platform/network/qt/ResourceRequestQt.cpp
+++ b/WebCore/platform/network/qt/ResourceRequestQt.cpp
@@ -64,6 +64,11 @@ QNetworkRequest ResourceRequest::toNetworkRequest(QObject* originatingFrame) con
             request.setRawHeader(name, "");
     }
 
+    // Make sure we always have an Accept header; some sites require this to
+    // serve subresources
+    if (!request.hasRawHeader("Accept"))
+        request.setRawHeader("Accept", "*/*");
+
     switch (cachePolicy()) {
     case ReloadIgnoringCacheData:
         request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);

-- 
WebKit Debian packaging