browser(webkit): roll back to using same proxy for http & https (#2471)
This commit is contained in:
parent
601eddfa98
commit
c03b39a30e
|
|
@ -1 +1 @@
|
|||
1264
|
||||
1265
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue