Merge pull request #61 from danieldean/master

Close exec websockets on exit.

Author: matthewalanpenning

lxd-dashboard/containers-single.php

@@ -5813,9 +5813,14 @@ function establishInstanceWebSocketExecConnection() {
 
           //Listen for "data" websocket messages
           execDataSocket.onmessage = function (e) {      
-            if (e.data instanceof ArrayBuffer) {
-              if (convertArrayBuffer2String(e.data) != null){
-                execTerminal.write(convertArrayBuffer2String(e.data));
+            if (e.data.length == 0) {
+              execControlSocket.close();
+              execDataSocket.close();
+            } else {
+              if (e.data instanceof ArrayBuffer) {
+                if (convertArrayBuffer2String(e.data) != null){
+                  execTerminal.write(convertArrayBuffer2String(e.data));
+                }
               }
             }
           };

lxd-dashboard/virtual-machines-single.php

@@ -4759,9 +4759,14 @@ function establishInstanceWebSocketExecConnection() {
       
           //Listen for "data" websocket messages
           execDataSocket.onmessage = function (e) {      
-            if (e.data instanceof ArrayBuffer) {
-              if (convertArrayBuffer2String(e.data) != null){
-                execTerminal.write(convertArrayBuffer2String(e.data));
+            if (e.data.length == 0) {
+              execControlSocket.close();
+              execDataSocket.close();
+            } else {
+              if (e.data instanceof ArrayBuffer) {
+                if (convertArrayBuffer2String(e.data) != null){
+                  execTerminal.write(convertArrayBuffer2String(e.data));
+                }
               }
             }
           };