2008-02-18 Stephanie Lewis <slewis@apple.com>
authorslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Feb 2008 00:48:54 +0000 (00:48 +0000)
committerslewis@apple.com <slewis@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 19 Feb 2008 00:48:54 +0000 (00:48 +0000)
        Reviewed by Adam.

Remove workaround for <rdar://problem/5695848>.

        * platform/network/cf/ResourceResponseCFNet.cpp:
        (WebCore::ResourceResponse::doUpdateResourceResponse):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/network/cf/ResourceResponseCFNet.cpp

index 14cb40c..e9782c9 100644 (file)
@@ -1,3 +1,12 @@
+2008-02-18  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Adam.
+
+        Remove workaround for <rdar://problem/5695848>.
+        
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        (WebCore::ResourceResponse::doUpdateResourceResponse):
+
 2008-02-18  Samuel Weinig  <sam@webkit.org>
 
         Reviewed by Geoff Garen.
index c9d1d3f..d643f8e 100644 (file)
@@ -100,29 +100,6 @@ void ResourceResponse::doUpdateResourceResponse()
             m_httpHeaderFields.set((CFStringRef)keys[i], (CFStringRef)values[i]);
     } else
         m_httpStatusCode = 0;
-
-    // FIXME: This is a workaround for <rdar://problem/5695848>. This code should be removed once that bug is fixed.
-    if (m_url.isLocalFile() && ( m_mimeType == "text/html" || m_mimeType == "text/plain" )) {
-        const String& path = m_url.path();
-        static const String xhtmlExt(".xhtml");
-        static const String htmlExt(".html");
-        static const String xmlExt(".xml");
-        static const String svgExt(".svg");
-        static const String jsExt(".js");
-        static const String cssExt(".css");
-        if (path.endsWith(xhtmlExt, false))
-            m_mimeType = "application/xhtml+xml";
-        else if (path.endsWith(htmlExt, false))
-            m_mimeType = "text/html";
-        else if (path.endsWith(xmlExt, false))
-            m_mimeType = "text/xml";
-        else if (path.endsWith(jsExt, false))
-            m_mimeType = "text/javascript";
-        else if (path.endsWith(svgExt, false))
-            m_mimeType = "image/svg+xml";
-        else if (path.endsWith(cssExt, false))
-            m_mimeType = "text/css";
-    }
 }
 
 }