summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'fix_ssl_recv_time_out' of ↵脇坂 友貴2018-02-014-3/+7
| |\ | | | | | | | | | https://github.com/trozet/websocket-client into trozet-fix_ssl_recv_time_out
| | * Fixes raising WebSocketTimeoutException with SSLTim Rozet2018-01-234-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Update README.rstliris2018-01-251-2/+0
| | |
* | | refactorHiroki Ohtani2018-02-091-9/+15
| | |
* | | rmed Dispatcher.dispatch() and dispatcher.dispatch(), simplifying apibubbleboy142018-01-241-5/+0
|/ /
* | docHiroki Ohtani2018-01-241-0/+1
| |
* | Merge branch 'bubbleboy14-master'Hiroki Ohtani2018-01-241-36/+59
|\ \ | |/ |/|
| * refs #375Hiroki Ohtani2018-01-242-6/+22
| |
| * Merge branch 'master' of https://github.com/bubbleboy14/websocket-client ↵Hiroki Ohtani2018-01-242-37/+44
| |\ |/ / | | | | into bubbleboy14-master
| * Merge branch 'master' into masterbubbleboy142018-01-093-1/+3
| |\
| * | 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
| | |
| * | added rel to install_requires[]bubbleboy142017-12-241-1/+1
| | |
| * | 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-223-11/+32
| | |
* | | revertHiroki Ohtani2018-01-221-1/+1
| | |
* | | add documentHiroki Ohtani2018-01-221-0/+3
| | |
* | | Merge branch 'pdonis-master'Hiroki Ohtani2018-01-221-2/+2
|\ \ \
| * \ \ 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-222-2/+2
| | |
* | | Merge pull request #380 from jin10086/patch-1liris2018-01-221-4/+4
|\ \ \ | |/ / |/| | Fix the rst syntax to make it better
| * | Fix the rst syntax to make it betterpachong2018-01-051-4/+4
|/ /
* | Merge branch 'master' of https://github.com/websocket-client/websocket-clientv0.46.0Hiroki Ohtani2017-12-301-1/+1
|\ \
| * \ Merge pull request #376 from cjds/patch-2liris2017-12-301-1/+1
| |\ \ | | |/ | |/| Make link in Readme go somehwere (404 with current link)
| | * Make link in Readme go somehwereCarl Saldanha2017-12-241-1/+1
| |/
* | fixed #3799Hiroki Ohtani2017-12-302-1/+2
|/
* fixed #370Hiroki Ohtani2017-12-244-4/+10
|
* update document for wsaccelv0.45.0Hiroki Ohtani2017-12-241-2/+9
|
* change licneseHiroki Ohtani2017-12-242-159/+130
|
* Merge branch 'master' of https://github.com/websocket-client/websocket-clientHiroki Ohtani2017-12-101-2/+2
|\
| * Merge pull request #371 from Marenthyu/patch-1liris2017-12-101-2/+2
| |\ | | | | | | Fix typos preventing _app.py from functioning
| | * 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
|/
* Merge branch 'master' of https://github.com/websocket-client/websocket-clientHiroki Ohtani2017-12-091-1/+2
|\
| * Merge pull request #361 from ukrexpo/masterliris2017-12-091-1/+2
| |\ | | | | | | Update README.rst
| | * Update README.rstVitalii Lishcheniuk2017-10-111-1/+2
| | |
* | | fixed #365Hiroki Ohtani2017-12-092-4/+5
|/ /
* | fixed #360 : add documentHiroki Ohtani2017-12-091-0/+1
| |
* | Merge branch 'novel-yet-trivial-patch-1'Hiroki Ohtani2017-12-091-1/+4
|\ \
| * \ Merge branch 'patch-1' of ↵Hiroki Ohtani2017-12-091-1/+4
| |\ \ |/ / / | | | | | | https://github.com/novel-yet-trivial/websocket-client into novel-yet-trivial-patch-1
| * | Update example for python3novel-yet-trivial2017-10-051-1/+4
| |/ | | | | `thread` has been renamed `_thread` in python3.
* | fixed #356 : add documentHiroki Ohtani2017-12-091-0/+1
| |
* | Merge branch 'eendebakpt-master'Hiroki Ohtani2017-12-091-1/+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
| | |