Title: [293861] trunk/Source/WebKit
- Revision
- 293861
- Author
- achristen...@apple.com
- Date
- 2022-05-05 15:14:41 -0700 (Thu, 05 May 2022)
Log Message
Unreviewed, reverting r293697.
Mergred to branch, not needed on trunk
Reverted changeset:
"Revert all use of
_setPrivacyProxyFailClosedForUnreachableNonMainHosts"
https://bugs.webkit.org/show_bug.cgi?id=239977
https://commits.webkit.org/r293697
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (293860 => 293861)
--- trunk/Source/WebKit/ChangeLog 2022-05-05 21:40:17 UTC (rev 293860)
+++ trunk/Source/WebKit/ChangeLog 2022-05-05 22:14:41 UTC (rev 293861)
@@ -1,5 +1,18 @@
2022-05-05 Alex Christensen <achristen...@webkit.org>
+ Unreviewed, reverting r293697.
+
+ Mergred to branch, not needed on trunk
+
+ Reverted changeset:
+
+ "Revert all use of
+ _setPrivacyProxyFailClosedForUnreachableNonMainHosts"
+ https://bugs.webkit.org/show_bug.cgi?id=239977
+ https://commits.webkit.org/r293697
+
+2022-05-05 Alex Christensen <achristen...@webkit.org>
+
Allow hw.cpu64bit_capable sysctl-read in network process sandbox on iOS
https://bugs.webkit.org/show_bug.cgi?id=240124
<rdar://92797350>
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (293860 => 293861)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-05 21:40:17 UTC (rev 293860)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2022-05-05 22:14:41 UTC (rev 293861)
@@ -340,6 +340,14 @@
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 (293860 => 293861)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-05 21:40:17 UTC (rev 293860)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2022-05-05 22:14:41 UTC (rev 293861)
@@ -1713,6 +1713,17 @@
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
