File tree Expand file tree Collapse file tree
src/vs/code/electron-main Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -601,9 +601,12 @@ export class CodeWindow extends Disposable implements ICodeWindow {
601601 }
602602 // Do not set to empty configuration at startup if setting is empty to not override configuration through CLI options:
603603 const env = process . env ;
604- const newHttpProxy = ( this . configurationService . getValue < string > ( 'http.proxy' ) || '' ) . trim ( )
604+ let newHttpProxy = ( this . configurationService . getValue < string > ( 'http.proxy' ) || '' ) . trim ( )
605605 || ( env . https_proxy || process . env . HTTPS_PROXY || process . env . http_proxy || process . env . HTTP_PROXY || '' ) . trim ( ) // Not standardized.
606606 || undefined ;
607+ if ( newHttpProxy ?. endsWith ( '/' ) ) {
608+ newHttpProxy = newHttpProxy . substr ( 0 , newHttpProxy . length - 1 ) ;
609+ }
607610 const newNoProxy = ( env . no_proxy || env . NO_PROXY || '' ) . trim ( ) || undefined ; // Not standardized.
608611 if ( ( newHttpProxy || '' ) . indexOf ( '@' ) === - 1 && ( newHttpProxy !== this . currentHttpProxy || newNoProxy !== this . currentNoProxy ) ) {
609612 this . currentHttpProxy = newHttpProxy ;
You can’t perform that action at this time.
0 commit comments