OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

TLS socket still doesn't work

Browse Source
This commit is contained in:
Asher
2019-07-25 17:39:43 -05:00
parent a4f21fb0d4
commit 4c4a179bce
9 changed files with 113 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci.bash
View File

@ -17,7 +17,7 @@ function docker-build() {
if [[ "${image}" == "codercom/nbin-alpine" ]] ; then
docker exec "${containerId}" apk add libxkbfile-dev libsecret-dev
else
# TODO: at some point git existing but now it seems to have disappeared.
# TODO: at some point git existed but it seems to have disappeared.
docker exec "${containerId}" yum install -y libxkbfile-devel libsecret-devel git
fi

12
scripts/vscode.patch
View File

@ -371,7 +371,7 @@ index 9f68b645b6..f0cae7111d 100644
this.channel.call('setLevel', level);
}
diff --git a/src/vs/platform/remote/browser/browserWebSocketFactory.ts b/src/vs/platform/remote/browser/browserWebSocketFactory.ts
index 6d9ecbcf5a..1ebd5a4b84 100644
index 6d9ecbcf5a..1b3499dddf 100644
--- a/src/vs/platform/remote/browser/browserWebSocketFactory.ts
+++ b/src/vs/platform/remote/browser/browserWebSocketFactory.ts
@@ -79,7 +79,7 @@ class BrowserSocket implements ISocket {
@ -379,7 +379,7 @@ index 6d9ecbcf5a..1ebd5a4b84 100644
connect(host: string, port: number, query: string, callback: IConnectCallback): void {
const errorListener = (err: any) => callback(err, undefined);
- const socket = new WebSocket(`ws://${host}:${port}/?${query}&skipWebSocketFrames=false`);
+ const socket = new WebSocket(`ws://${host}:${port}${window.location.pathname.replace(/\/+$/, '')}/?${query}&skipWebSocketFrames=false`);
+ const socket = new WebSocket(`${window.location.protocol === 'https:' ? 'wss' : 'ws'}://${host}:${port}${window.location.pathname.replace(/\/+$/, '')}/?${query}&skipWebSocketFrames=false`);
socket.onopen = function (event) {
socket.removeEventListener('error', errorListener);
callback(undefined, new BrowserSocket(socket));
@ -1397,7 +1397,7 @@ index 306d58f915..58c603ad3d 100644
if (definition.fontCharacter || definition.fontColor) {
let body = '';
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index c28adc0ad9..4517c308da 100644
index c28adc0ad9..3d1adba3d9 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -128,7 +128,7 @@ import 'vs/workbench/services/extensions/browser/extensionService';
@ -1422,3 +1422,9 @@ index c28adc0ad9..4517c308da 100644
// Output Panel
import 'vs/workbench/contrib/output/browser/output.contribution';
@@ -356,3 +356,5 @@ import 'vs/workbench/contrib/outline/browser/outline.contribution';
// import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
//#endregion
+
+import 'vs/server/src/client';