Changeset 189200 in webkit

Timestamp:

Aug 31, 2015 5:29:24 PM (9 years ago)

Author:

Brent Fulgham

Message:

[Win] WebKit cannot load pages based on "​file://" URLs
​https://bugs.webkit.org/show_bug.cgi?id=148596
<rdar://problem/22432585>

Reviewed by Dean Jackson.

• platform/URL.cpp:

(WebCore::URL::URL): Work around bug that causes this assertion to fire on
the Apple Windows build.

• platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:

(WebCore::adjustMIMETypeIfNecessary): Added. If the URL is for a local file,
determine the MIME type based on extension. Otherwise use the default MIME type.
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse): If
the CFURLResponse has no MIME type, call 'adjustMIMETypeIfNecessary'.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/URL.cpp (modified) (1 diff)
• platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-08-31  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] WebKit cannot load pages based on "file://" URLs
+        https://bugs.webkit.org/show_bug.cgi?id=148596
+        <rdar://problem/22432585>
+
+        Reviewed by Dean Jackson.
+
+        * platform/URL.cpp:
+        (WebCore::URL::URL): Work around bug that causes this assertion to fire on
+        the Apple Windows build.
+        * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+        (WebCore::adjustMIMETypeIfNecessary): Added. If the URL is for a local file,
+        determine the MIME type based on extension. Otherwise use the default MIME type.
+        (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse): If
+        the CFURLResponse has no MIME type, call 'adjustMIMETypeIfNecessary'.
+
 2015-08-31  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/URL.cpp

@@ -433 +433 @@
 {
     parse(url);
+#if OS(WINDOWS)
+    // FIXME(148598): Work around Windows local file handling bug in CFNetwork
+    ASSERT(isLocalFile() || url == m_string);
+#else
     ASSERT(url == m_string);
+#endif
 }
 

trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004-2013 Apple Inc.  All rights reserved.
+ * Copyright (C) 2004-2013, 2015 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -110 +110 @@
     CFURLResponseSetMIMEType(response, defaultMIMETypeString);
 }
+
+static void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse)
+{
+    RetainPtr<CFStringRef> result = CFURLResponseGetMIMEType(cfResponse);
+    RetainPtr<CFStringRef> originalResult = result;
+
+    if (!result) {
+        CFURLRef cfURL = CFURLResponseGetURL(cfResponse);
+        URL url(cfURL);
+        if (url.isLocalFile()) {
+            String mimeType = mimeTypeFromURL(url);
+            result = mimeType.createCFString().leakRef();
+        }
+    }
+
+    if (!result) {
+        static CFStringRef defaultMIMETypeString = WebCore::defaultMIMEType().createCFString().leakRef();
+        result = defaultMIMETypeString;
+    }
+
+    if (result != originalResult)
+        CFURLResponseSetMIMEType(cfResponse, result.get());
+}
 #endif // !PLATFORM(COCOA)
 
@@ -132 +155 @@
 #endif // !PLATFORM(IOS)
 #else
+    if (!CFURLResponseGetMIMEType(cfResponse))
+        adjustMIMETypeIfNecessary(cfResponse);
+
     if (!CFURLResponseGetMIMEType(cfResponse)) {
         // We should never be applying the default MIMEType if we told the networking layer to do content sniffing for handle.