Changeset 295183 in webkit

Timestamp:

Jun 2, 2022, 11:45:27 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 5883fa195996. rdar://problem/92442408

REGRESSION (r281791): [iOS] WKWebView cannot load local .log file
​https://bugs.webkit.org/show_bug.cgi?id=239591
<rdar://problem/92442408>

Reviewed by Geoffrey Garen.

The refactoring in Bug 229414 did not retain the old behavior on iOS where local
files (which do not get a MIME type assigned by CFNetwork) passed through the
same 'preferredMIMETypeForFileExtensionFromUTType' logic we use on macOS.

• platform/network/ios/WebCoreURLResponseIOS.mm: (WebCore::adjustMIMETypeIfNecessary):

Canonical link: ​https://commits.webkit.org/250499@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ios/WebCoreURLResponseIOS.mm (modified) (2 diffs)

branches/safari-613-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-12  Brent Fulgham  <bfulgham@apple.com>
+
+        REGRESSION (r281791): [iOS] WKWebView cannot load local .log file
+        https://bugs.webkit.org/show_bug.cgi?id=239591
+        <rdar://problem/92442408>
+
+        Reviewed by Geoffrey Garen.
+
+        The refactoring in Bug 229414 did not retain the old behavior on iOS where local
+        files (which do not get a MIME type assigned by CFNetwork) passed through the
+        same 'preferredMIMETypeForFileExtensionFromUTType' logic we use on macOS.
+
+        * platform/network/ios/WebCoreURLResponseIOS.mm:
+        (WebCore::adjustMIMETypeIfNecessary):
+
 2022-05-06  Manuel Rego Casasnovas  <rego@igalia.com>
 

branches/safari-613-branch/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm

@@ -50 +50 @@
             }
         }
-        CFURLResponseSetMIMEType(response, CFSTR("application/octet-stream"));
-        return;
     }
 
@@ -68 +66 @@
         if (updatedType && (!type || CFStringCompare(type, updatedType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
             CFURLResponseSetMIMEType(response, updatedType.get());
+        return;
     }
 #endif // USE(QUICK_LOOK)
+    if (!type)
+        CFURLResponseSetMIMEType(response, CFSTR("application/octet-stream"));
 }