From c03b39a30eac2b39a13a3517d8a01ec39fd48947 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Thu, 4 Jun 2020 13:56:51 -0700 Subject: [PATCH] browser(webkit): roll back to using same proxy for http & https (#2471) --- browser_patches/webkit/BUILD_NUMBER | 2 +- .../webkit/embedder/Playwright/mac/AppDelegate.m | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 5c59e571ed..d07807cbf0 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1 +1 @@ -1264 +1265 diff --git a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m index 2a6117e2ae..c441270730 100644 --- a/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m +++ b/browser_patches/webkit/embedder/Playwright/mac/AppDelegate.m @@ -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