summaryrefslogtreecommitdiff
path: root/websocket
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix the issue that websocket status message may not presentKevin Wang2018-02-221-1/+2
| |/
* | Add NullHandler to logger to fix python 2 issue. Fix #342 Fix #341Tom Gurion2018-02-211-0/+1
|/
* Merge branch 'status_message' of https://github.com/Mottl/websocket-client ↵Hiroki Ohtani2018-02-164-8/+11
|\ | | | | | | into Mottl-status_message
| * Added status message when HTTP can't be upgraded to WSDmitry Mottl2018-02-144-8/+11
| |
* | Merge branch 'master' of https://github.com/tianhuyang/websocket-client into ↵Hiroki Ohtani2018-02-161-0/+2
|\ \ | | | | | | | | | tianhuyang-master
| * | fix #395Tianhu Yang2018-02-131-0/+2
| |/
* | Fixed issue #397 with ssl importDmitry Mottl2018-02-141-0/+1
|/
* fixed #386Hiroki Ohtani2018-02-093-12/+37
|
* Merge branch 'master' of https://github.com/websocket-client/websocket-clientHiroki Ohtani2018-02-091-1/+1
|\
| * fix version脇坂 友貴2018-02-011-1/+1
| |
| * Merge branch 'fix_ssl_recv_time_out' of ↵脇坂 友貴2018-02-012-2/+2
| |\ | | | | | | | | | https://github.com/trozet/websocket-client into trozet-fix_ssl_recv_time_out
| | * Fixes raising WebSocketTimeoutException with SSLTim Rozet2018-01-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous message used for detecting SSL was too specific and was missing cases where SSL simply returned "timed out". This patch changes the detection to mirror what is done in the send for detecting timeouts. Fixes #387 Signed-off-by: Tim Rozet <tdrozet@gmail.com>
* | | refactorHiroki Ohtani2018-02-091-9/+15
| | |
* | | rmed Dispatcher.dispatch() and dispatcher.dispatch(), simplifying apibubbleboy142018-01-241-5/+0
|/ /
* | refs #375Hiroki Ohtani2018-01-241-5/+21
| |
* | Merge branch 'master' of https://github.com/bubbleboy14/websocket-client ↵Hiroki Ohtani2018-01-241-36/+43
|\ \ | |/ |/| | | into bubbleboy14-master
| * Merge branch 'master' into masterbubbleboy142018-01-091-0/+1
| |\
| * | friendlier KeyboardInterruptbubbleboy142017-12-241-0/+1
| | |
| * | teardown(): return out if not running; call on close framebubbleboy142017-12-241-1/+3
| | |
| * | moved teardown code into function called on close or exceptionbubbleboy142017-12-241-11/+13
| | |
| * | fixed typobubbleboy142017-12-241-1/+0
| | |
| * | WebSocketApp.run_forever(): replaced select() loop with rel.read() event ↵bubbleboy142017-12-241-26/+28
| | | | | | | | | | | | registration; no_dispatch kwarg (default False), for switching off immediate dispatch (thus supporting multiple simultaneous clients). added rel import.
* | | fixed #340Hiroki Ohtani2018-01-221-7/+28
| | |
* | | revertHiroki Ohtani2018-01-221-1/+1
| | |
* | | Merge branch 'master' of https://github.com/pdonis/websocket-client into ↵Hiroki Ohtani2018-01-221-2/+2
|\ \ \ | | | | | | | | | | | | pdonis-master
| * | | Fix variable name to avoid shadowing 'type' builtin.Peter Donis2018-01-151-2/+2
| | | |
| * | | Fix socket constructor in _open_socket to use family, type, and proto from ↵Peter Donis2018-01-151-2/+2
| | |/ | |/| | | | | | | | | | | | | getaddrinfo. This patch addresses issue #382.
* | | set version number.Hiroki Ohtani2018-01-221-1/+1
|/ /
* | fixed #3799Hiroki Ohtani2017-12-301-1/+1
|/
* fixed #370Hiroki Ohtani2017-12-242-3/+4
|
* Merge branch 'master' of https://github.com/websocket-client/websocket-clientHiroki Ohtani2017-12-101-2/+2
|\
| * Another typo, same dealPeter "Marenthyu" Fredebold2017-12-091-1/+1
| | | | | | should be True not true
| * Fix typoPeter "Marenthyu" Fredebold2017-12-091-1/+1
| | | | | | should be False not false
* | refs #357Hiroki Ohtani2017-12-101-2/+8
|/
* fixed #365Hiroki Ohtani2017-12-091-4/+4
|
* Merge branch 'master' of https://github.com/eendebakpt/websocket-client into ↵Hiroki Ohtani2017-12-091-1/+4
|\ | | | | | | eendebakpt-master
| * use separate lock for recvPieter Eendebak2017-09-281-1/+3
| |
| * add lock to recv functionPieter Eendebak2017-09-261-1/+2
| |
* | Merge branch 'close-frame-parsing' of ↵Hiroki Ohtani2017-12-091-1/+1
|\ \ | | | | | | | | | https://github.com/mikesss/websocket-client into mikesss-close-frame-parsing
| * | Parse close frame response correctly when reason presentMike Sutjipto2017-09-141-1/+1
| |/
* | Merge branch 'master' of https://github.com/Greums/websocket-client into ↵Hiroki Ohtani2017-12-091-0/+2
|\ \ | | | | | | | | | Greums-master
| * | Fix SSL: SSLV3_ALERT_HANDSHAKE_FAILURE on Debian StretchDamien Le Bourdonnec2017-09-141-0/+2
| |/
* | Merge branch 'gaierror' of https://github.com/willstott101/websocket-client ↵Hiroki Ohtani2017-12-092-8/+17
|\ \ | | | | | | | | | into willstott101-gaierror
| * | Wrap socket.gaierror with subclass of WebsocketExceptionWill Stott2017-09-142-8/+17
| |/
* | Merge branch 'master' of https://github.com/bpmckinnon/websocket-client into ↵Hiroki Ohtani2017-12-091-3/+6
|\ \ | | | | | | | | | bpmckinnon-master
| * | No_proxy settings should be preserved to allow blocking when proxy settings ↵Brian Mckinnon2017-08-301-2/+1
| | | | | | | | | | | | are pulled from the environment variable
| * | Added support for windows connection refused errorBrian Mckinnon2017-08-301-1/+5
| |/
* | Update _handshake.pyPeter "Marenthyu" Fredebold2017-11-301-2/+2
| | | | | | see https://github.com/websocket-client/websocket-client/issues/368
* | 0.45.0ukwksk2017-11-131-1/+1
| |
* | Merge pull request #347 from mckelvin/fix-undefined-variableukwksk2017-11-131-1/+1
|\ \ | | | | | | Fix undefined variable