Changeset 21794 in webkit

Timestamp:

May 25, 2007 8:06:25 PM (17 years ago)

Author:

weinig

Message:

Reviewed by Oliver of the Hunt.

Fixed <rdar://problem/5230247> at least 43 xhtml tests fail in
Leopard because they are being interpreted as html

Adds a work around for <rdar://problem/5230154> which explicitly
sets local .xhtml files to have the MIME type application/xhtml+xml.

• platform/network/mac/ResourceResponseMac.mm: (WebCore::ResourceResponse::doUpdateResourceResponse):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceResponseMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-25  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Oliver of the Hunt.
+
+        Fixed <rdar://problem/5230247> at least 43 xhtml tests fail in 
+        Leopard because they are being interpreted as html
+
+        Adds a work around for <rdar://problem/5230154> which explicitly
+        sets local .xhtml files to have the MIME type application/xhtml+xml.
+
+        * platform/network/mac/ResourceResponseMac.mm:
+        (WebCore::ResourceResponse::doUpdateResourceResponse):
+
 2007-05-25  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/platform/network/mac/ResourceResponseMac.mm

@@ -76 +76 @@
         while (NSString *name = [e nextObject])
             m_httpHeaderFields.set(name, [headers objectForKey:name]);
-    } else
+    } else {
         m_httpStatusCode = 0;
+
+#ifndef BUILDING_ON_TIGER
+        // FIXME: This is a work around for <rdar://problem/5230154> (-[NSURLConnection initWithRequest:delegate:] 
+        // is returning incorrect MIME type for local .xhtml files) which is only required in Leopard.
+        if (m_url.isLocalFile() && m_mimeType == "text/html") {
+            const String& path = m_url.path();
+            static const String xhtmlExt(".xhtml");
+            if (path.endsWith(xhtmlExt, false))
+                m_mimeType = "application/xhtml+xml";
+        }
+#endif
+    }
 }