Skip to content

Commit 6e3220a

Browse files
committed
Merge shellEnv into process.env (#120332)
1 parent 5dee7d5 commit 6e3220a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/vs/platform/request/node/requestService.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ export class RequestService extends Disposable implements IRequestService {
6363
this.logService.trace('RequestService#request', options.url);
6464

6565
const { proxyUrl, strictSSL } = this;
66-
const agent = options.agent ? options.agent : await getProxyAgent(options.url || '', await resolveShellEnv(this.logService, this.environmentService.args, process.env), { proxyUrl, strictSSL });
66+
const env = {
67+
...process.env,
68+
...(await resolveShellEnv(this.logService, this.environmentService.args, process.env)),
69+
};
70+
const agent = options.agent ? options.agent : await getProxyAgent(options.url || '', env, { proxyUrl, strictSSL });
6771

6872
options.agent = agent;
6973
options.strictSSL = strictSSL;

0 commit comments

Comments
 (0)