Title: [182289] trunk/Source/WebKit2
- Revision
- 182289
- Author
- oli...@apple.com
- Date
- 2015-04-02 14:52:53 -0700 (Thu, 02 Apr 2015)
Log Message
Ensure that we always set network ATS context in the network process
https://bugs.webkit.org/show_bug.cgi?id=143343
Reviewed by Dan Bernstein.
If a custom cache location or size we were early returning before setting
the CFNetwork ATS context. This is clearly an error.
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182288 => 182289)
--- trunk/Source/WebKit2/ChangeLog 2015-04-02 21:48:32 UTC (rev 182288)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-02 21:52:53 UTC (rev 182289)
@@ -1,3 +1,16 @@
+2015-04-02 Oliver Hunt <oli...@apple.com>
+
+ Ensure that we always set network ATS context in the network process
+ https://bugs.webkit.org/show_bug.cgi?id=143343
+
+ Reviewed by Dan Bernstein.
+
+ If a custom cache location or size we were early returning before setting
+ the CFNetwork ATS context. This is clearly an error.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+
2015-04-02 Alexey Proskuryakov <a...@apple.com>
Make checkURLReceivedFromWebProcess not rely on details of platform URL implementation.
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (182288 => 182289)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-02 21:48:32 UTC (rev 182288)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-02 21:52:53 UTC (rev 182289)
@@ -54,6 +54,10 @@
#endif
m_diskCacheDirectory = parameters.diskCacheDirectory;
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+ _CFNetworkSetATSContext(parameters.networkATSContext.get());
+#endif
+
// FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
// - memory cache size passed from UI process is always ignored;
// - disk cache size passed from UI process is effectively a minimum size.
@@ -88,9 +92,6 @@
return;
_CFURLCacheSetMinSizeForVMCachedResource(cache.get(), NetworkResourceLoader::fileBackedResourceMinimumSize());
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
- _CFNetworkSetATSContext(parameters.networkATSContext.get());
-#endif
}
static uint64_t memorySize()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
