Changeset 293699 in webkit

Timestamp:

May 2, 2022, 4:25:25 PM (4 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/92617943

Location:

branches/safari-613-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

branches/safari-613-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2022-05-02  Alan Coon  <alancoon@apple.com>
+
+        Apply patch. rdar://problem/92617943
+
+    2022-05-02  Alex Christensen  <achristensen@webkit.org>
+
+            Revert all use of _setPrivacyProxyFailClosedForUnreachableNonMainHosts
+            https://bugs.webkit.org/show_bug.cgi?id=239977
+            <rdar://92617943>
+
+            Due to what is likely confusion about internal integration processes,
+            the powers that be have decided that the best course of action for now
+            is to restore the status quo and accept any consequences that may entail.
+
+            * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+            (WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
+            * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+            (WebKit::NetworkSessionCocoa::createWebSocketTask):
+
 2022-04-29  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

@@ -340 +340 @@
     RetainPtr<NSURLRequest> nsRequest = request.nsURLRequest(WebCore::HTTPBodyUpdatePolicy::UpdateHTTPBody);
     RetainPtr<NSMutableURLRequest> mutableRequest = adoptNS([nsRequest.get() mutableCopy]);
-
-    if (parameters.isMainFrameNavigation
-        || parameters.hadMainFrameMainResourcePrivateRelayed
-        || !parameters.topOrigin
-        || request.url().host() == parameters.topOrigin->host()) {
-        if ([mutableRequest respondsToSelector:@selector(_setPrivacyProxyFailClosedForUnreachableNonMainHosts:)])
-            [mutableRequest _setPrivacyProxyFailClosedForUnreachableNonMainHosts:YES];
-    }
 
 #if ENABLE(APP_PRIVACY_REPORT)

branches/safari-613-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -1717 +1717 @@
 #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()];