Title: [202507] trunk/Source/WebCore
- Revision
- 202507
- Author
- [email protected]
- Date
- 2016-06-27 12:17:24 -0700 (Mon, 27 Jun 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202506 => 202507)
--- trunk/Source/WebCore/ChangeLog 2016-06-27 19:11:33 UTC (rev 202506)
+++ trunk/Source/WebCore/ChangeLog 2016-06-27 19:17:24 UTC (rev 202507)
@@ -1,3 +1,18 @@
+2016-06-27 Oliver Hunt <[email protected]>
+
+ 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 <[email protected]>
[iOS] Media controls are too cramped with small video
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (202506 => 202507)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2016-06-27 19:11:33 UTC (rev 202506)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2016-06-27 19:17:24 UTC (rev 202507)
@@ -226,12 +226,11 @@
#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]);
}
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (202506 => 202507)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-06-27 19:11:33 UTC (rev 202506)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2016-06-27 19:17:24 UTC (rev 202507)
@@ -201,7 +201,6 @@
#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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
