Title: [293697] trunk/Source/WebKit
- Revision
- 293697
- Author
- achristen...@apple.com
- Date
- 2022-05-02 16:04:27 -0700 (Mon, 02 May 2022)
Log Message
Revert all use of _setPrivacyProxyFailClosedForUnreachableNonMainHosts
https://bugs.webkit.org/show_bug.cgi?id=239977
<rdar://92617943>
Reviewed by John Wilander.
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (293696 => 293697)
--- trunk/Source/WebKit/ChangeLog 2022-05-02 23:04:06 UTC (rev 293696)
+++ trunk/Source/WebKit/ChangeLog 2022-05-02 23:04:27 UTC (rev 293697)
@@ -1,3 +1,20 @@
+2022-05-02 Alex Christensen <achristen...@webkit.org>
+
+ Revert all use of _setPrivacyProxyFailClosedForUnreachableNonMainHosts
+ https://bugs.webkit.org/show_bug.cgi?id=239977
+ <rdar://92617943>
+
+ Reviewed by John Wilander.
+
+ 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-05-02 Wenson Hsieh <wenson_hs...@apple.com>
[macOS] The "Markup Image" services menu item should be gated on image analysis results
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (293696 => 293697)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-02 23:04:06 UTC (rev 293696)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-02 23:04:27 UTC (rev 293697)
@@ -340,14 +340,6 @@
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)
mutableRequest.get().attribution = request.isAppInitiated() ? NSURLRequestAttributionDeveloper : NSURLRequestAttributionUser;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (293696 => 293697)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-02 23:04:06 UTC (rev 293696)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-02 23:04:27 UTC (rev 293697)
@@ -1713,17 +1713,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
