Changeset 202507 in webkit

Timestamp:

Jun 27, 2016 12:17:24 PM (8 years ago)

Author:

oliver@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (1 diff)
• platform/spi/cf/CFNetworkSPI.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -227 +227 @@
     [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]);
 }

trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

@@ -202 +202 @@
 
 #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);