summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjhtitor <john.titor@openmailbox.org>2018-12-18 12:29:47 +0000
committerjhtitor <john.titor@openmailbox.org>2018-12-18 12:29:47 +0000
commit9a4562a7475e95cd8bcd790b65f4063e8147d53f (patch)
tree0e4a15e83c5f8d81f898c8ec340d83a18df79510
parent2c18d28f3596acfd269fa568fbf85ff9ca2b97fb (diff)
downloadwebsocket-client-9a4562a7475e95cd8bcd790b65f4063e8147d53f.tar.gz
Ensure that "timeout" is passed down, when calling WebSocket.connect()
Note: that still leaves "subprotocols", "header", "cookie", "origin" and "host" values in a bugged state (they are NOT passed down).
-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))