diff options
| author | liris <liris.pp@gmail.com> | 2019-02-23 14:10:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 14:10:52 +0900 |
| commit | 6c7119f42c95f68dd0ea07516ced8a471e5f7308 (patch) | |
| tree | 6921c1d24d16d89c80004ee70932984faf8aac30 /websocket | |
| parent | a7a8eeb8408621aae97124a8d48228414d81d85a (diff) | |
| parent | 9a4562a7475e95cd8bcd790b65f4063e8147d53f (diff) | |
| download | websocket-client-6c7119f42c95f68dd0ea07516ced8a471e5f7308.tar.gz | |
Merge pull request #513 from jhtitor/pass_timeout
Diffstat (limited to 'websocket')
| -rw-r--r-- | websocket/_core.py | 3 |
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)) |