Diff
Modified: trunk/Source/WTF/ChangeLog (249341 => 249342)
--- trunk/Source/WTF/ChangeLog 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WTF/ChangeLog 2019-08-30 20:26:08 UTC (rev 249342)
@@ -1,5 +1,14 @@
2019-08-30 Alex Christensen <achristen...@webkit.org>
+ Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+ https://bugs.webkit.org/show_bug.cgi?id=201279
+
+ Reviewed by Darin Adler.
+
+ * wtf/Platform.h:
+
+2019-08-30 Alex Christensen <achristen...@webkit.org>
+
Fix non-iOS iOS-family and catalyst builds after r249019
https://bugs.webkit.org/show_bug.cgi?id=200945
Modified: trunk/Source/WTF/wtf/Platform.h (249341 => 249342)
--- trunk/Source/WTF/wtf/Platform.h 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WTF/wtf/Platform.h 2019-08-30 20:26:08 UTC (rev 249342)
@@ -1436,10 +1436,6 @@
#endif
#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
-#define HAVE_CFNETWORK_WITH_IGNORE_HSTS 1
-#endif
-
-#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
#define HAVE_CFNETWORK_WITH_AUTO_ADDED_HTTP_HEADER_SUPPRESSION_SUPPORT 1
/* FIXME: Does this work, and is this needed on other iOS family platforms? */
#if PLATFORM(MAC) || PLATFORM(IOS)
Modified: trunk/Source/WebCore/ChangeLog (249341 => 249342)
--- trunk/Source/WebCore/ChangeLog 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WebCore/ChangeLog 2019-08-30 20:26:08 UTC (rev 249342)
@@ -1,3 +1,14 @@
+2019-08-30 Alex Christensen <achristen...@webkit.org>
+
+ Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+ https://bugs.webkit.org/show_bug.cgi?id=201279
+
+ Reviewed by Darin Adler.
+
+ * platform/network/mac/WebCoreURLResponse.mm:
+ (WebCore::synthesizeRedirectResponseIfNecessary):
+ (WebCore::schemeWasUpgradedDueToDynamicHSTS): Deleted.
+
2019-08-30 Wenson Hsieh <wenson_hs...@apple.com>
Caret does not appear in text field inside a transformed, overflow: hidden container
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm (249341 => 249342)
--- trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreURLResponse.mm 2019-08-30 20:26:08 UTC (rev 249342)
@@ -330,22 +330,12 @@
}
#endif
-static bool schemeWasUpgradedDueToDynamicHSTS(NSURLRequest *request)
-{
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
- return [request _schemeWasUpgradedDueToDynamicHSTS];
-#else
- UNUSED_PARAM(request);
- return false;
-#endif
-}
-
NSURLResponse *synthesizeRedirectResponseIfNecessary(NSURLRequest *currentRequest, NSURLRequest *newRequest, NSURLResponse *redirectResponse)
{
if (redirectResponse)
return redirectResponse;
- if ([[[newRequest URL] scheme] isEqualToString:[[currentRequest URL] scheme]] && !schemeWasUpgradedDueToDynamicHSTS(newRequest))
+ if ([[[newRequest URL] scheme] isEqualToString:[[currentRequest URL] scheme]] && ![newRequest _schemeWasUpgradedDueToDynamicHSTS])
return nil;
return [[ResourceResponse::syntheticRedirectResponse(URL([currentRequest URL]), URL([newRequest URL])).nsURLResponse() retain] autorelease];
Modified: trunk/Source/WebKit/ChangeLog (249341 => 249342)
--- trunk/Source/WebKit/ChangeLog 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WebKit/ChangeLog 2019-08-30 20:26:08 UTC (rev 249342)
@@ -1,5 +1,18 @@
2019-08-30 Alex Christensen <achristen...@webkit.org>
+ Remove HAVE_CFNETWORK_WITH_IGNORE_HSTS conditional
+ https://bugs.webkit.org/show_bug.cgi?id=201279
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (ignoreHSTS):
+ (updateIgnoreStrictTransportSecuritySettingIfNecessary):
+ (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):
+
+2019-08-30 Alex Christensen <achristen...@webkit.org>
+
Allow process cache to cache processes when using a non-default persistent WebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=201329
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (249341 => 249342)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-08-30 20:23:00 UTC (rev 249341)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-08-30 20:26:08 UTC (rev 249342)
@@ -399,7 +399,7 @@
completionHandler(WebCore::createHTTPBodyNSInputStream(*body).get());
}
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
static NSURLRequest* downgradeRequest(NSURLRequest *request)
{
NSMutableURLRequest *nsMutableRequest = [[request mutableCopy] autorelease];
@@ -422,7 +422,6 @@
}
#endif
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
static void setIgnoreHSTS(NSMutableURLRequest *request, bool ignoreHSTS)
{
if ([request respondsToSelector:@selector(_setIgnoreHSTS:)])
@@ -434,11 +433,9 @@
return [request respondsToSelector:@selector(_ignoreHSTS)]
&& [request _ignoreHSTS];
}
-#endif
static NSURLRequest* updateIgnoreStrictTransportSecuritySettingIfNecessary(NSURLRequest *request, bool shouldIgnoreHSTS)
{
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS)
if ([request.URL.scheme isEqualToString:@"https"] && shouldIgnoreHSTS && ignoreHSTS(request)) {
// The request was upgraded for some other reason than HSTS.
// Don't ignore HSTS to avoid the risk of another downgrade.
@@ -452,9 +449,6 @@
setIgnoreHSTS(nsMutableRequest, shouldIgnoreHSTS);
return nsMutableRequest;
}
-#else
- UNUSED_PARAM(shouldIgnoreHSTS);
-#endif
return request;
}
@@ -468,7 +462,7 @@
auto completionHandlerCopy = Block_copy(completionHandler);
bool shouldIgnoreHSTS = false;
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
shouldIgnoreHSTS = schemeWasUpgradedDueToDynamicHSTS(request) && _session->networkProcess().storageSession(_session->sessionID())->shouldBlockCookies(request, networkDataTask->frameID(), networkDataTask->pageID());
if (shouldIgnoreHSTS) {
request = downgradeRequest(request);
@@ -501,7 +495,7 @@
if (auto* networkDataTask = [self existingTask:task]) {
bool shouldIgnoreHSTS = false;
-#if HAVE(CFNETWORK_WITH_IGNORE_HSTS) && ENABLE(RESOURCE_LOAD_STATISTICS)
+#if ENABLE(RESOURCE_LOAD_STATISTICS)
shouldIgnoreHSTS = schemeWasUpgradedDueToDynamicHSTS(request) && _session->networkProcess().storageSession(_session->sessionID())->shouldBlockCookies(request, networkDataTask->frameID(), networkDataTask->pageID());
if (shouldIgnoreHSTS) {
request = downgradeRequest(request);
