Merge "Allow wss as websocket protocol" into stable/queens

2018-12-05 01:34:23 +00:00
parent ce5585da7a 5a0a132830
commit 20ede94ab0
1 changed files with 1 additions and 1 deletions
--- a/zunclient/common/websocketclient/websocketclient.py
+++ b/zunclient/common/websocketclient/websocketclient.py
@@ -378,7 +378,7 @@ class WINCHHandler(object):


 def do_attach(zunclient, url, container_id, escape, close_wait):
-    if url.startswith("ws://"):
+    if url.startswith("ws://") or url.startswith("wss://"):
        try:
            wscls = WebSocketClient(zunclient=zunclient, url=url,
                                    id=container_id, escape=escape,