maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve running on https

Browse source
This commit is contained in:
Alex Dima 2021-11-20 15:00:26 +01:00
parent a67d90abd0
commit 6b1a058a88
No known key found for this signature in database
GPG key ID: 39563C1504FDD0C9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/platform/remote/browser/browserSocketFactory.ts
View file

@ -240,7 +240,8 @@ export class BrowserSocketFactory implements ISocketFactory {
}
connect(host: string, port: number, query: string, callback: IConnectCallback): void {
const socket = this._webSocketFactory.create(`ws://${/:/.test(host) ? `[${host}]` : host}:${port}/?${query}&skipWebSocketFrames=false`);
const webSocketSchema = (/^https:/.test(window.location.href) ? 'wss' : 'ws');
const socket = this._webSocketFactory.create(`${webSocketSchema}://${/:/.test(host) ? `[${host}]` : host}:${port}/?${query}&skipWebSocketFrames=false`);
const errorListener = socket.onError((err) => callback(err, undefined));
socket.onOpen(() => {
errorListener.dispose();

3
src/vs/platform/remote/browser/remoteAuthorityResolverService.ts
View file

@ -63,7 +63,8 @@ export class RemoteAuthorityResolverService extends Disposable implements IRemot
const pieces = authority.split(':');
return { authority: { authority, host: pieces[0], port: parseInt(pieces[1], 10), connectionToken } };
}
return { authority: { authority, host: authority, port: 80, connectionToken } };
const port = (/^https:/.test(window.location.href) ? 443 : 80);
return { authority: { authority, host: authority, port: port, connectionToken } };
}
_clearResolvedAuthority(authority: string): void {