[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_kioslave/http=3A_Workaround_yet_another_?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-06-30 19:39:24
Message-ID: 20110630193924.16EB1A60B0 () git ! kde ! org
[Download RAW message or body]

Git commit 4e7a01e45966b2104fa30a7cb187a8e9228bcbd1 by Dawit Alemayehu.
Committed on 26/06/2011 at 23:39.
Pushed by adawit into branch 'master'.

Workaround yet another incorrect mime-type (image/x-ico) sent by a server.

BUG: 275547
FIXED-IN:4.6.5

(cherry picked from commit 03f6549292d8c5d32e7f3c58af48cea6fdaecc74)

M  +2    -0    kioslave/http/http.cpp     

http://commits.kde.org/kdelibs/4e7a01e45966b2104fa30a7cb187a8e9228bcbd1

diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
index 9bbd531..00f95e2 100644
--- a/kioslave/http/http.cpp
+++ b/kioslave/http/http.cpp
@@ -2655,6 +2655,8 @@ void HTTPProtocol::fixupResponseMimetype()
         m_mimeType = QLatin1String("audio/x-wav");
     else if (m_mimeType == QLatin1String("image/x-ms-bmp"))
         m_mimeType = QLatin1String("image/bmp");
+    else if (m_mimeType == QLatin1String("image/x-icon"))
+        m_mimeType = QLatin1String("image/vnd.microsoft.icon");
 
     // Crypto ones....
     else if (m_mimeType == QLatin1String("application/pkix-cert") ||

[prev in list] [next in list] [prev in thread] [next in thread]