[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 21676781bc7428932f25806d7eeddf0293f25669
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 16:20:32 2009 +0000

    2009-10-16  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Mark Rowe.
    
            Chrome doesn't set Content-Type for file upload when the file extension
            is not recognized
            https://bugs.webkit.org/show_bug.cgi?id=30433
    
            Apparently, getMIMETypeForPath is supposed to return
            application/octet-stream when it doesn't have a better MIME type.
    
            * platform/chromium/MimeTypeRegistryChromium.cpp:
            (WebCore::MIMETypeRegistry::getMIMETypeForPath):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49682 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 54d56da..3ebe7fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-16  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Chrome doesn't set Content-Type for file upload when the file extension
+        is not recognized
+        https://bugs.webkit.org/show_bug.cgi?id=30433
+
+        Apparently, getMIMETypeForPath is supposed to return
+        application/octet-stream when it doesn't have a better MIME type.
+
+        * platform/chromium/MimeTypeRegistryChromium.cpp:
+        (WebCore::MIMETypeRegistry::getMIMETypeForPath):
+
 2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Pull out r49676 as it caused build breakges on Symbian
diff --git a/WebCore/platform/chromium/MimeTypeRegistryChromium.cpp b/WebCore/platform/chromium/MimeTypeRegistryChromium.cpp
index 0f371b1..51bff80 100644
--- a/WebCore/platform/chromium/MimeTypeRegistryChromium.cpp
+++ b/WebCore/platform/chromium/MimeTypeRegistryChromium.cpp
@@ -78,6 +78,8 @@ String MIMETypeRegistry::getMIMETypeForPath(const String& path)
         // if a plugin can handle the extension.
         mimeType = getPluginMimeTypeFromExtension(extension);
     }
+    if (mimeType.isEmpty())
+        return "application/octet-stream";
     return mimeType;
 }
 

-- 
WebKit Debian packaging