Skip to content

Commit 1f41feb

Browse files
author
Matthew Benedict
committed
Alpha build 1
1 parent d4fb01e commit 1f41feb

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

Source/CyberCore/PAL/pal/spi/cf/CFNetworkSPI.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ CF_ENUM(CFHTTPCookieStorageAcceptPolicy)
128128
CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
129129
};
130130

131-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
131+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
132132
typedef enum {
133133
nw_connection_privacy_stance_unknown = 0,
134134
nw_connection_privacy_stance_not_eligible = 1,
@@ -220,7 +220,7 @@ typedef enum {
220220
- (BOOL)_schemeWasUpgradedDueToDynamicHSTS;
221221
- (BOOL)_preventHSTSStorage;
222222
- (BOOL)_ignoreHSTS;
223-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
223+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
224224
@property (setter=_setPrivacyProxyFailClosed:) BOOL _privacyProxyFailClosed;
225225
#endif
226226
@end
@@ -280,7 +280,7 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
280280
@property (readwrite, assign) BOOL _allowsHTTP3;
281281
#endif
282282
@property (nullable, retain) _NSHSTSStorage *_hstsStorage;
283-
#if HAVE(NETWORK_LOADER)
283+
#if HAVE(NETWORK_LOADER) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
284284
@property BOOL _usesNWLoader;
285285
#endif
286286
#if HAVE(CFNETWORK_NSURLSESSION_CONNECTION_CACHE_LIMITS)
@@ -321,7 +321,7 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
321321
@property (assign, readonly) NSInteger _responseHeaderBytesReceived;
322322
@property (assign, readonly) int64_t _responseBodyBytesReceived;
323323
@property (assign, readonly) int64_t _responseBodyBytesDecoded;
324-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
324+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
325325
@property (assign, readonly) nw_connection_privacy_stance_t _privacyStance;
326326
#endif
327327
@end

Source/CyberCore/platform/network/cocoa/CyberCoreNSURLSession.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ - (instancetype)_initWithMetrics:(CyberCore::NetworkLoadMetrics&&)metrics;
7272
@property (readonly, getter=isExpensive) BOOL expensive;
7373
@property (readonly, getter=isConstrained) BOOL constrained;
7474
@property (readonly, getter=isMultipath) BOOL multipath;
75-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
75+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
7676
@property (assign, readonly) nw_connection_privacy_stance_t _privacyStance;
7777
#endif
7878
@end
@@ -166,7 +166,7 @@ - (BOOL)isReusedConnection
166166
return _metrics.isReusedConnection;
167167
}
168168

169-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
169+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
170170
@dynamic _privacyStance;
171171
- (nw_connection_privacy_stance_t)_privacyStance
172172
{

Source/CyberKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static NSURLSessionAuthChallengeDisposition toNSURLSessionAuthChallengeDispositi
150150
return CyberCore::NetworkLoadPriority::Medium;
151151
}
152152

153-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
153+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
154154
static CyberCore::PrivacyStance toPrivacyStance(nw_connection_privacy_stance_t stance)
155155
{
156156
switch (stance) {
@@ -875,7 +875,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didComp
875875
NSMutableDictionary *newUserInfo = oldUserInfo ? [NSMutableDictionary dictionaryWithDictionary:oldUserInfo] : [NSMutableDictionary dictionary];
876876
newUserInfo[@"networkTaskDescription"] = [task description];
877877
if (RefPtr networkDataTask = [self existingTask:task]) {
878-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
878+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
879879
newUserInfo[@"networkTaskMetricsPrivacyStance"] = privacyStanceToString(networkDataTask->networkLoadMetrics().privacyStance);
880880
#endif
881881
#if HAVE(NETWORK_RESOLUTION_FAILURE_REPORT) && defined(NW_CONNECTION_HAS_FAILED_RESOLUTION_REPORT)
@@ -958,7 +958,7 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFini
958958
networkLoadMetrics.multipath = m.multipath;
959959
networkLoadMetrics.isReusedConnection = m.isReusedConnection;
960960

961-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
961+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
962962
networkLoadMetrics.privacyStance = toPrivacyStance(m._privacyStance);
963963
#endif
964964

@@ -1054,7 +1054,7 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
10541054
NSURLSessionTaskMetrics *taskMetrics = dataTask._incompleteTaskMetrics;
10551055

10561056
NSURLSessionTaskTransactionMetrics *metrics = taskMetrics.transactionMetrics.lastObject;
1057-
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
1057+
#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
10581058
auto privateRelayed = metrics._privacyStance == nw_connection_privacy_stance_direct
10591059
|| metrics._privacyStance == nw_connection_privacy_stance_not_eligible
10601060
? PrivateRelayed::No : PrivateRelayed::Yes;
@@ -1388,7 +1388,7 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
13881388
configuration.URLCredentialStorage = adoptNS([[NSURLCredentialStorage alloc] _initWithIdentifier:parameters.dataStoreIdentifier->toString() private:NO]).get();
13891389
#endif
13901390

1391-
#if HAVE(NETWORK_LOADER)
1391+
#if HAVE(NETWORK_LOADER) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
13921392
RELEASE_LOG_IF(parameters.useNetworkLoader, NetworkSession, "Using experimental network loader.");
13931393
configuration._usesNWLoader = parameters.useNetworkLoader;
13941394
#endif

Source/CyberKit/UIProcess/WebsiteData/Cocoa/WebsiteDataStoreCocoa.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static bool experimentalFeatureEnabled(const String& key, bool defaultValue = fa
219219

220220
bool WebsiteDataStore::useNetworkLoader()
221221
{
222-
#if HAVE(NETWORK_LOADER)
222+
#if HAVE(NETWORK_LOADER) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
223223
return experimentalFeatureEnabled(WebPreferencesKey::cFNetworkNetworkLoaderEnabledKey());
224224
#else
225225
return false;

script_fakesigner.entitlements

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@
223223
</array>
224224
<key>com.apple.security.network.client</key>
225225
<true/>
226+
<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
227+
<array>
228+
<string>com.apple.diagnosticd</string>
229+
<string>com.apple.fontservicesd</string>
230+
</array>
226231
<key>com.apple.security.temporary-exception.sbpl</key>
227232
<array>
228233
<string>(allow mach-issue-extension (require-all (extension-class &quot;com.apple.webkit.extension.mach&quot;)))</string>

0 commit comments

Comments
 (0)