Update ATS WebContent exception for more robust framework information

https://bugs.webkit.org/show_bug.cgi?id=159151 Reviewed by Alex Christensen. We found some unexpected poor interaction with AVFoundation in the existing CFNetwork SPI. This new SPI is more solid and let's us provide more useful information while also being more future proof against new frameworks and ATS modes. * platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::createNSURLConnection): Canonical link: https://commits.webkit.org/177258@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202507 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jun 27, 2016 · 0a185db361978a8c58bcb7b0778231971347a258 · 0a185db
1 parent 4a4272b
commit 0a185db361978a8c58bcb7b0778231971347a258
Showing with 18 additions and 5 deletions.

+15 −0 Source/WebCore/ChangeLog

+3 −4 Source/WebCore/platform/network/mac/ResourceHandleMac.mm

+0 −1 Source/WebCore/platform/spi/cf/CFNetworkSPI.h
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2016-06-27  Oliver Hunt  <oliver@apple.com>
+
+        Update ATS WebContent exception for more robust framework information
+        https://bugs.webkit.org/show_bug.cgi?id=159151
+
+        Reviewed by Alex Christensen.
+
+        We found some unexpected poor interaction with AVFoundation in the existing
+        CFNetwork SPI. This new SPI is more solid and let's us provide more useful
+        information while also being more future proof against new frameworks and
+        ATS modes.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::createNSURLConnection):
+
 2016-06-27  Antoine Quint  <graouts@apple.com>
 
         [iOS] Media controls are too cramped with small video

diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -226,12 +226,11 @@ static bool synchronousWillSendRequestEnabled()
 #if HAVE(TIMINGDATAOPTIONS)
     [propertyDictionary setObject:@{@"_kCFURLConnectionPropertyTimingDataOptions": @(_TimingDataOptionsEnableW3CNavigationTiming)} forKey:@"kCFURLConnectionURLConnectionProperties"];
 #endif
-
-#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+
     // This is used to signal that to CFNetwork that this connection should be considered
     // web content for purposes of App Transport Security.
-    [propertyDictionary setObject:@{@"NSAllowsArbitraryLoadsInWebContent": @""} forKey:(NSString *)_kCFURLConnectionPropertyATSContext];
-#endif
+    [propertyDictionary setObject:@{@"NSAllowsArbitraryLoadsInWebContent": @YES} forKey:@"_kCFURLConnectionPropertyATSFrameworkOverrides"];
+
     d->m_connection = adoptNS([[NSURLConnection alloc] _initWithRequest:nsRequest delegate:delegate usesCache:usesCache maxContentLength:0 startImmediately:NO connectionProperties:propertyDictionary]);
 }
 

diff --git a/Source/WebCore/platform/spi/cf/CFNetworkSPI.h b/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
@@ -201,7 +201,6 @@ enum : NSUInteger {
 #endif
 
 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
-EXTERN_C const CFStringRef _kCFURLConnectionPropertyATSContext;
 EXTERN_C CFDataRef _CFNetworkCopyATSContext(void);
 EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
 #endif