browser(webkit): roll back to using same proxy for http & https (#2471)

This commit is contained in:
Pavel Feldman 2020-06-04 13:56:51 -07:00 committed by GitHub
parent 601eddfa98
commit c03b39a30e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -1 +1 @@
1264
1265

View File

@ -148,14 +148,13 @@ const NSActivityOptions ActivityOptions =
[dictionary setObject:host forKey:(NSString *)kCFStreamPropertySOCKSProxyHost];
if (port)
[dictionary setObject:port forKey:(NSString *)kCFStreamPropertySOCKSProxyPort];
} else if ([proxyServer hasPrefix:@"https://"]) {
[dictionary setObject:host forKey:(NSString *)kCFStreamPropertyHTTPSProxyHost];
if (port)
[dictionary setObject:port forKey:(NSString *)kCFStreamPropertyHTTPSProxyPort];
} else {
[dictionary setObject:host forKey:(NSString *)kCFStreamPropertyHTTPSProxyHost];
[dictionary setObject:host forKey:(NSString *)kCFStreamPropertyHTTPProxyHost];
if (port)
if (port) {
[dictionary setObject:port forKey:(NSString *)kCFStreamPropertyHTTPSProxyPort];
[dictionary setObject:port forKey:(NSString *)kCFStreamPropertyHTTPProxyPort];
}
}
#pragma clang diagnostic pop