From eae3d93a2041f3a857a7e2b0ffe7d2552a4bbfd3 Mon Sep 17 00:00:00 2001 From: Pavel Feldman Date: Tue, 3 Nov 2020 14:28:04 -0800 Subject: [PATCH] browser(webkit): fix proxy ignore pattern set on context level (#4328) --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index a3cb7fc98d..916acbaebc 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1374 -Changed: yurys@chromium.org Tue 03 Nov 2020 01:08:53 PM PST +1375 +Changed: pavel.feldman@gmail.com Tue Nov 3 14:23:35 PST 2020 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index f0ad333bd5..daa56a3412 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -13946,10 +13946,10 @@ index 31d29091985f34a65134a2b0e7cb3ace1dae441d..571ceac8a4b291fa6e91eb8b17065c0a }; diff --git a/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..09cbc4f3abbeb329c0b396b946b77614a911e8b0 +index 0000000000000000000000000000000000000000..31a4e32d4cf8442049f0bea04c817a40b801c1f7 --- /dev/null +++ b/Source/WebKit/UIProcess/glib/InspectorPlaywrightAgentClientGLib.cpp -@@ -0,0 +1,146 @@ +@@ -0,0 +1,147 @@ +/* + * Copyright (C) 2019 Microsoft Corporation. + * @@ -14017,6 +14017,7 @@ index 0000000000000000000000000000000000000000..09cbc4f3abbeb329c0b396b946b77614 + protectTokens.append(WTFMove(cstr)); + } + } ++ ignoreHosts.append(nullptr); + return parseRawProxySettings(proxyServer, ignoreHosts.data()); +} +