[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 a700582fc59f99fd47d25f543e34c8e4ba94346b
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 18:56:36 2010 +0000

    2010-07-13  Richard Moore <rich at kde.org>, Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] MIME handling in qtwebkit network layer case-sensitivity
    
            https://bugs.webkit.org/show_bug.cgi?id=28654
    
            Modify existing test uppercase-mime-type.html to test for the
            lower-casing explicitly.
    
            * http/tests/mime/uppercase-mime-type-expected.txt:
            * http/tests/mime/uppercase-mime-type.html:
    2010-07-13  Richard Moore <rich at kde.org>, Robert Hogan  <robert at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] MIME handling in qtwebkit network layer case-sensitivity
    
            https://bugs.webkit.org/show_bug.cgi?id=28654
    
            Like other platforms, Qt needs to convert MIME types to lower case
            so they will be handled by WebCore.
    
            * platform/network/qt/QNetworkReplyHandler.cpp:
            (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63229 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ca8ed9e..c10fc34 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-13  Richard Moore <rich at kde.org>, Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] MIME handling in qtwebkit network layer case-sensitivity
+
+        https://bugs.webkit.org/show_bug.cgi?id=28654
+
+        Modify existing test uppercase-mime-type.html to test for the
+        lower-casing explicitly.
+
+        * http/tests/mime/uppercase-mime-type-expected.txt:
+        * http/tests/mime/uppercase-mime-type.html:
+
 2010-07-10  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt b/LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt
index c7ab752..223d620 100644
--- a/LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt
+++ b/LayoutTests/http/tests/mime/uppercase-mime-type-expected.txt
@@ -1 +1,2 @@
+uppercase-mime-type.php has MIME type text/html
 If this text is shown, that means the new document was successfully loaded.
diff --git a/LayoutTests/http/tests/mime/uppercase-mime-type.html b/LayoutTests/http/tests/mime/uppercase-mime-type.html
index 9ef3b87..16e5a92 100644
--- a/LayoutTests/http/tests/mime/uppercase-mime-type.html
+++ b/LayoutTests/http/tests/mime/uppercase-mime-type.html
@@ -2,6 +2,7 @@
 <script>
 if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
+    layoutTestController.dumpResourceResponseMIMETypes();
     layoutTestController.dumpAsText();
 }
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 06faa6f..3b04352 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-13  Richard Moore <rich at kde.org>, Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] MIME handling in qtwebkit network layer case-sensitivity
+
+        https://bugs.webkit.org/show_bug.cgi?id=28654
+
+        Like other platforms, Qt needs to convert MIME types to lower case
+        so they will be handled by WebCore.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::sendResponseIfNeeded):
+
 2010-07-13  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 1ae24ff..9bced0e 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -309,7 +309,7 @@ void QNetworkReplyHandler::sendResponseIfNeeded()
     }
 
     KURL url(m_reply->url());
-    ResourceResponse response(url, mimeType,
+    ResourceResponse response(url, mimeType.lower(),
                               m_reply->header(QNetworkRequest::ContentLengthHeader).toLongLong(),
                               encoding, String());
 

-- 
WebKit Debian packaging