summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Close 410Chris Frey2018-04-111-2/+0
| |/
* | Merge pull request #417 from jhtitor/masterliris2018-05-272-2/+60
|\ \ | | | | | | socks5 via pysocks support
| * | Add pysocks support.jhtitor2018-03-302-2/+60
| |/
* | Merge pull request #415 from minus7/masterliris2018-05-273-4976/+12
|\ \ | | | | | | Load system default certificates if none are given
| * | Remove bundled cacert.pemminus2018-03-213-4975/+6
| | |
| * | Check if SSLContext supports loading default certsminus2018-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | This changes behavior. When creating a TLS connection, not specifying cacert/capath and while on a Python version without load_default_certs, creating the socket will not fail as before, but verifying the connection will fail instead.
| * | Load system default certificates if none are givenminus2018-03-211-1/+6
| |/
* | Merge pull request #411 from shdown/masterliris2018-05-271-5/+12
|\ \ | | | | | | Fix waiting forever on ping/pong timeout
| * | Check return value of read callback in dispatchersshdown2018-03-221-2/+4
| | |
| * | Fix waiting forever on ping/pong timeoutshdown2018-03-141-5/+10
| |/
* | Merge pull request #409 from hugobordigoni/masterliris2018-05-271-1/+1
|\ \ | | | | | | fix #408
| * | fix #408Hugo Bordigoni2018-03-011-1/+1
| |/
* | Merge pull request #403 from kevinxw/fix-websocket-statusliris2018-05-271-1/+2
|\ \ | | | | | | Fix the issue that websocket status message may not present
| * | Fix the issue that websocket status message may not presentKevin Wang2018-02-221-1/+2
| |/
* | Merge pull request #400 from Nagasaki45/masterliris2018-05-271-0/+1
|\ \ | |/ |/| Add NullHandler to logger to fix python 2 issue. Fix #342 Fix #341
| * Add NullHandler to logger to fix python 2 issue. Fix #342 Fix #341Tom Gurion2018-02-211-0/+1
|/
* add documentv0.47.0Hiroki Ohtani2018-02-161-0/+1
|
* Merge branch 'Mottl-status_message'Hiroki Ohtani2018-02-164-8/+11
|\
| * 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
| |
* | add documentHiroki Ohtani2018-02-161-0/+1
| |
* | Merge branch 'tianhuyang-master'Hiroki Ohtani2018-02-161-0/+2
|\ \
| * \ 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
| |/
* | Merge pull request #398 from Mottl/ssl_issueliris2018-02-141-0/+1
|\ \ | |/ |/| Fixed issue #397 with ssl import
| * Fixed issue #397 with ssl importDmitry Mottl2018-02-141-0/+1
|/
* add docHiroki Ohtani2018-02-091-0/+1
|
* fixed #386Hiroki Ohtani2018-02-093-12/+37
|
* Merge branch 'master' of https://github.com/websocket-client/websocket-clientHiroki Ohtani2018-02-093-3/+2
|\
| * fix version脇坂 友貴2018-02-013-6/+3
| |
| * 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
|\ \ \