diff options
| author | liris <liris.pp@gmail.com> | 2019-02-23 14:14:51 +0900 |
|---|---|---|
| committer | liris <liris.pp@gmail.com> | 2019-02-23 14:14:51 +0900 |
| commit | 53de7b00ab8c85dcc6111313913dc4adb2eb7952 (patch) | |
| tree | cca2d74383c3fc5416971e1852f849096f631d8f /websocket | |
| parent | cffa824dea203d30514ab4e3f1959f509c4e391e (diff) | |
| parent | 6c7119f42c95f68dd0ea07516ced8a471e5f7308 (diff) | |
| download | websocket-client-53de7b00ab8c85dcc6111313913dc4adb2eb7952.tar.gz | |
Merge branch 'master' of https://github.com/websocket-client/websocket-client
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)) |