summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--websocket/_core.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/websocket/_core.py b/websocket/_core.py
index c91ad63..5006e70 100644
--- a/websocket/_core.py
+++ b/websocket/_core.py
@@ -216,6 +216,9 @@ class WebSocket(object):
"socket" - pre-initialized stream socket.
"""
+ # FIXME: "subprotocols" are getting lost, not passed down
+ # FIXME: "header", "cookie", "origin" and "host" too
+ self.sock_opt.timeout = options.get('timeout', self.sock_opt.timeout)
self.sock, addrs = connect(url, self.sock_opt, proxy_info(**options),
options.pop('socket', None))