Title: [292435] branches/safari-614.1.8-branch/Source/WebKit
- Revision
- 292435
- Author
- alanc...@apple.com
- Date
- 2022-04-05 16:02:03 -0700 (Tue, 05 Apr 2022)
Log Message
Cherry-pick r292431. rdar://problem/91320393
Revert r291598
https://bugs.webkit.org/show_bug.cgi?id=238842
<rdar://90677955>
Reviewed by Geoff Garen.
It caused some problems and needs further analysis.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::createWebSocketTask):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.8-branch/Source/WebKit/ChangeLog (292434 => 292435)
--- branches/safari-614.1.8-branch/Source/WebKit/ChangeLog 2022-04-05 23:00:50 UTC (rev 292434)
+++ branches/safari-614.1.8-branch/Source/WebKit/ChangeLog 2022-04-05 23:02:03 UTC (rev 292435)
@@ -1,3 +1,35 @@
+2022-04-05 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292431. rdar://problem/91320393
+
+ Revert r291598
+ https://bugs.webkit.org/show_bug.cgi?id=238842
+ <rdar://90677955>
+
+ Reviewed by Geoff Garen.
+
+ It caused some problems and needs further analysis.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::createWebSocketTask):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-05 Alex Christensen <achristen...@webkit.org>
+
+ Revert r291598
+ https://bugs.webkit.org/show_bug.cgi?id=238842
+ <rdar://90677955>
+
+ Reviewed by Geoff Garen.
+
+ It caused some problems and needs further analysis.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::createWebSocketTask):
+
2022-04-04 Alan Coon <alanc...@apple.com>
Cherry-pick r292258. rdar://problem/91069927
Modified: branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (292434 => 292435)
--- branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-04-05 23:00:50 UTC (rev 292434)
+++ branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-04-05 23:02:03 UTC (rev 292435)
@@ -340,14 +340,6 @@
RetainPtr<NSURLRequest> nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
- if (parameters.isMainFrameNavigation
- || parameters.hadMainFrameMainResourcePrivateRelayed // This means it did not fail. FIXME: adjust names to reflect this.
- || !parameters.topOrigin
- || request.url().host() == parameters.topOrigin->host()) {
- if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
- [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
- }
-
#if ENABLE(APP_PRIVACY_REPORT)
mutableRequest.get().attribution = request.isAppInitiated() ? NSURLRequestAttributionDeveloper : NSURLRequestAttributionUser;
#endif
Modified: branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (292434 => 292435)
--- branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-04-05 23:00:50 UTC (rev 292434)
+++ branches/safari-614.1.8-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-04-05 23:02:03 UTC (rev 292435)
@@ -1718,17 +1718,6 @@
appPrivacyReportTestingData().didLoadAppInitiatedRequest(nsRequest.get().attribution == NSURLRequestAttributionDeveloper);
#endif
- // FIXME: This function can make up to 3 copies of a request.
- // Reduce that to one if the protocol is null, the request isn't app initiated,
- // or the main frame main resource was private relayed, then set all properties
- // on the one copy.
- if (hadMainFrameMainResourcePrivateRelayed || request.url().host() == clientOrigin.topOrigin.host) {
- RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
- if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
- [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
- nsRequest = WTFMove(mutableRequest);
- }
-
auto& sessionSet = sessionSetForPage(webPageProxyID);
RetainPtr<NSURLSessionWebSocketTask> task = [sessionSet.sessionWithCredentialStorage.session webSocketTaskWithRequest:nsRequest.get()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
