Merge pull request #1853 from cdr/fix-heartbeat

Fix connections sticking around indefinitely

ci/dev/vscode.patch

@@ -1811,7 +1811,7 @@ index 0000000000..1166835371
 +}
 diff --git a/src/vs/server/node/connection.ts b/src/vs/server/node/connection.ts
 new file mode 100644
-index 0000000000..23934687de
+index 0000000000..36e80fb696
 --- /dev/null
 +++ b/src/vs/server/node/connection.ts
 @@ -0,0 +1,157 @@
@@ -1878,7 +1878,7 @@ index 0000000000..23934687de
 +	protected doDispose(): void {
 +		this.protocol.sendDisconnect();
 +		this.protocol.dispose();
-+		this.protocol.getSocket().end();
++		this.protocol.getUnderlyingSocket().destroy();
 +	}
 +
 +	protected doReconnect(socket: ISocket, buffer: VSBuffer): void {
@@ -1905,7 +1905,7 @@ index 0000000000..23934687de
 +		if (this.process) {
 +			this.process.kill();
 +		}
-+		this.protocol.getSocket().end();
++		this.protocol.getUnderlyingSocket().destroy();
 +	}
 +
 +	protected doReconnect(socket: ISocket, buffer: VSBuffer): void {