Skip to content

Commit 566a4ca

Browse files
committed
useHostProxy > isUseHostProxyEnabled() (microsoft/vscode-copilot-release#3821)
1 parent 27544c5 commit 566a4ca

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@vscode/deviceid": "^0.1.1",
7676
"@vscode/iconv-lite-umd": "0.7.0",
7777
"@vscode/policy-watcher": "^1.1.8",
78-
"@vscode/proxy-agent": "^0.29.0",
78+
"@vscode/proxy-agent": "^0.30.0",
7979
"@vscode/ripgrep": "^1.15.9",
8080
"@vscode/spdlog": "^0.15.0",
8181
"@vscode/sqlite3": "5.1.8-vscode",

remote/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@parcel/watcher": "2.5.0",
99
"@vscode/deviceid": "^0.1.1",
1010
"@vscode/iconv-lite-umd": "0.7.0",
11-
"@vscode/proxy-agent": "^0.29.0",
11+
"@vscode/proxy-agent": "^0.30.0",
1212
"@vscode/ripgrep": "^1.15.9",
1313
"@vscode/spdlog": "^0.15.0",
1414
"@vscode/tree-sitter-wasm": "^0.0.5",

src/vs/workbench/api/node/proxyResolver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function connectProxyResolver(
4343
const useHostProxyDefault = initData.environment.useHostProxy ?? !isRemote;
4444
const fallbackToLocalKerberos = useHostProxyDefault;
4545
const loadLocalCertificates = useHostProxyDefault;
46-
const isUseHostProxyEnabled = () => configProvider.getConfiguration('http').get<boolean>('useLocalProxyConfiguration', useHostProxyDefault);
46+
const isUseHostProxyEnabled = () => !isRemote || configProvider.getConfiguration('http').get<boolean>('useLocalProxyConfiguration', useHostProxyDefault);
4747
const params: ProxyAgentParams = {
4848
resolveProxy: url => extHostWorkspace.resolveProxy(url),
4949
lookupProxyAuthorization: lookupProxyAuthorization.bind(undefined, extHostWorkspace, extHostLogService, mainThreadTelemetry, configProvider, {}, {}, initData.remote.isRemote, fallbackToLocalKerberos),
@@ -71,7 +71,7 @@ export function connectProxyResolver(
7171
}
7272
},
7373
proxyResolveTelemetry: () => { },
74-
useHostProxy: isUseHostProxyEnabled(), // TODO: can change at runtime now
74+
isUseHostProxyEnabled,
7575
loadAdditionalCertificates: async () => {
7676
const promises: Promise<string[]>[] = [];
7777
if (initData.remote.isRemote) {

0 commit comments

Comments
 (0)