Changeset 295187 in webkit

Timestamp:

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

Author:

Alan Coon

Message:

Cherry-pick ad5aeb95fb39. rdar://problem/92442408

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

Unreviewed correction based on a comment from Darin.

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

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

Location:

branches/safari-613-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2022-05-13  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>
+
+        Unreviewed correction based on a comment from Darin.
+
+        * platform/network/ios/WebCoreURLResponseIOS.mm:
+        (WebCore::adjustMIMETypeIfNecessary):
+
 2022-05-12  Brent Fulgham  <bfulgham@apple.com>
 

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

@@ -64 +64 @@
         else if (auto extension = filePathExtension(response))
             updatedType = preferredMIMETypeForFileExtensionFromUTType(extension.get());
-        if (updatedType && (!type || CFStringCompare(type, updatedType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
+        if (updatedType && (!type || CFStringCompare(type, updatedType.get(), kCFCompareCaseInsensitive) != kCFCompareEqualTo)) {
             CFURLResponseSetMIMEType(response, updatedType.get());
-        return;
+            return;
+        }
     }
 #endif // USE(QUICK_LOOK)