Changeset 120035 in webkit

Timestamp:

Jun 11, 2012 8:44:38 PM (12 years ago)

Author:

mary.wu@torchmobile.com.cn

Message:

[BlackBerry] Wrong mimetype for empty file link
​https://bugs.webkit.org/show_bug.cgi?id=88642

Reviewed by Rob Buis.

RIM PR# 164164

For empty file link, we shouldn't give "application/octet-stream"
which will lead to download.

Reviewed internally by Charles Wei.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::sendResponseIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-11  Mary Wu  <mary.wu@torchmobile.com.cn>
+
+        [BlackBerry] Wrong mimetype for empty file link
+        https://bugs.webkit.org/show_bug.cgi?id=88642
+
+        Reviewed by Rob Buis.
+
+        RIM PR# 164164
+
+        For empty file link, we shouldn't give "application/octet-stream"
+        which will lead to download.
+
+        Reviewed internally by Charles Wei.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+
 2012-06-11  Jin Yang  <jin.a.yang@intel.com>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -619 +619 @@
     if (m_isFTP && m_isFTPDir)
         mimeType = "application/x-ftp-directory";
-    if (mimeType.isNull())
+    else if (mimeType.isNull())
         mimeType = extractMIMETypeFromMediaType(m_contentType);
-    if (mimeType.isNull())
-        mimeType = MIMETypeRegistry::getMIMETypeForPath(urlFilename);
+    if (mimeType.isNull()) {
+        if (m_dataReceived)
+            mimeType = MIMETypeRegistry::getMIMETypeForPath(urlFilename);
+        else
+            // For empty content, we shouldn't download.
+            mimeType = "text/plain";
+    }
     m_response.setMimeType(mimeType);