summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #586 from olie304/patch-1liris2019-12-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix for errors that occur when closing websocket from another thread
| * | | | | Fix for errors that occur when closing websocketOliver2019-11-281-2/+2
| |/ / / / | | | | | | | | | | https://github.com/websocket-client/websocket-client/issues/449
* | | | | Change Logliris2019-12-251-0/+2
| | | | |
* | | | | Merge pull request #587 from youthdev/masterliris2019-12-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix getting 400 bad request with long proxy authorization string
| * | | | | Fix getting 400 bad request with long proxy authorization stringtruong.hua2019-12-021-1/+1
| |/ / / /
* | | | | Merge pull request #589 from lantw44/wip/lantw/wsdump-Fix---headers-optionliris2019-12-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | wsdump: Fix --headers option
| * | | | | wsdump: Fix --headers optionTing-Wei Lan2019-12-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since https://github.com/websocket-client/websocket-client/pull/506 changes the way that options['header'] is used, it breaks --headers option of wsdump command because wsdump command uses a map object instead of a list here, which can only be used once. Therefore, after the first use with 'not in' operator, it becomes empty and no headers specified by the user are sent. To fix it, simply convert the map object into a list, so it can be use multiple times.
* | | | | start release 0.57.0liris2019-12-252-1/+3
|/ / / /
| * | | Pep8 fixesazaugg2019-04-245-4/+10
|/ / /
* | | release 0.56.0v0.56.0liris2019-03-213-2/+6
| | |
* | | Merge pull request #536 from trygveaa:dont-retry-sockets-with-timeout-0liris2019-03-212-2/+11
|\ \ \ | |/ / |/| | Don't retry sockets with timeout set to 0
| * | Don't retry sockets with timeout set to 0Trygve Aaberge2019-03-202-2/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-blocking sockets with the timeout set to 0, the select call in _recv and _send will return immediately without the socket being ready. This causes _recv to return None, which makes recv close the connection. Since a select with a timeout of 0 right after recv/send is pointless, just skip _recv and _send when timeout is 0. As for the handling of SSLWantReadError, SSLWantWriteError, EAGAIN and EWOULDBLOCK in _recv/_send, websocket-client can't handle these without blocking. Since applications which has timeout set to 0 don't want websocket-client to block them, they have to handle those errors themselves. Fixes #535
* | Merge pull request #529 from comet-ml/fix-closing-thread-safetyliris2019-02-231-1/+1
|\ \
| * | Fix `WebSocket.close` in multi-threaded environmentsBoris Feld2019-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In multi-threaded environment where the `WebsocketApp` lives in another thread than the main thread, the main thread might call `WebsocketApp.close` which will sends the closing message to the backend and then wait for the answer. This will likely makes the following loop https://github.com/websocket-client/websocket-client/blob/master/websocket/_app.py#L49 to ends which will calls https://github.com/websocket-client/websocket-client/blob/master/websocket/_app.py#L235. The second call will happened in the `WebsocketApp` thread and as the socket is already marked as not connected anymore, the second thread will jump directly into the `WebSocket.shutdown` method which will abruptly close the socket, stopping all in-progress sending and making the first call to `WebSocket.close` to crash as `self.sock` is replaces by None.
* | | update change logliris2019-02-231-0/+1
| | |
* | | Merge pull request #528 from trygveaa/fix-interrupted-system-callliris2019-02-231-16/+22
|\ \ \
| * | | Retry connect on "Interrupted system call"Trygve Aaberge2019-02-201-16/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When connecting to a socket, EINTR ("Interrupted system call") may be raised if the application receives a signal at the same time. Prior to Python 3.5, applications has to handle this themselves by retrying the connection. For more details, see https://www.python.org/dev/peps/pep-0475/ Fixes #527
* | | Merge branch 'master' of https://github.com/websocket-client/websocket-clientliris2019-02-231-0/+3
|\ \ \
| * \ \ Merge pull request #513 from jhtitor/pass_timeoutliris2019-02-231-0/+3
| |\ \ \
| | * | | Ensure that "timeout" is passed down, when calling WebSocket.connect()jhtitor2018-12-181-0/+3
| | |/ / | | | | | | | | | | | | | | | | Note: that still leaves "subprotocols", "header", "cookie", "origin" and "host" values in a bugged state (they are NOT passed down).
* | | | update change logliris2019-02-231-0/+1
| | | |
* | | | fixed errorliris2019-02-231-1/+2
| | | |
* | | | Merge branch 'master' of https://github.com/websocket-client/websocket-clientliris2019-02-231-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #517 from dmiyakawa/masterliris2019-02-231-1/+1
| |\ \ \
| | * | | Let setup.py use the same license as LICENSE fileDaisuke Miyakawa2019-01-041-1/+1
| | |/ /
* | | | update change logliris2019-02-231-0/+1
|/ / /
* | | update change logliris2019-02-231-0/+1
| | |
* | | Merge pull request #474 from ARMmbed/ssl-socket-fixliris2019-02-233-4/+51
|\ \ \ | |/ / |/| |
| * | Original version numberJuho Hovila2018-08-291-1/+1
| | |
| * | Fix SSL socket handling (#2)Juho Hovila2018-08-294-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix ssl socket handling Handle them as recommended in here https://bugs.python.org/issue21430 and in python documentation. Do not use undocumented SSLSocket pending * Increase version
* | | add docliris2018-12-151-1/+1
| | |
* | | Merge pull request #506 from Torxed/masterliris2018-12-151-2/+10
|\ \ \
| * | | Manually assigning WebSocket-VersionAnton Hvornum2018-11-251-2/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | When manually assigning `Sec-WebSocket-Key` & `Sec-WebSocket-Version`, websocket-client would raise: WebSocketException("Invalid WebSocket Header") Because the key for instance, would be inserted twice. The best way to get around this in the long run, would be to refrain from using lists as the header builder, since keys can't occur twice anyway. Thus, just creating the automated headers first, and then iterating over whatever the user inputs - would effectively replace any default headers automatically, without needing to parse "if host in options['headers']" etc. Just iterate over the headers given, replace the default ones and bam, profit.
* | | start 0.55.0liris2018-12-152-2/+2
| | |
* | | add docliris2018-12-151-0/+5
| | |
* | | Merge pull request #501 from tarma/add_resp_headersliris2018-12-152-2/+3
|\ \ \ | |/ / |/| |
| * | Add response header in WebSocketBadStatusExceptiontarma2018-11-052-2/+3
|/ /
* | fixed #497 proxy issuev0.54.0liris2018-11-011-1/+1
| |
* | add docsliris2018-10-281-0/+1
| |
* | Change Licenseliris2018-10-283-132/+8
| |
* | add docsliris2018-10-281-0/+1
| |
* | Merge branch 'master' of https://github.com/websocket-client/websocket-clientliris2018-10-281-4/+7
|\ \
| * \ Merge pull request #480 from aarondav/fix_on_closeliris2018-10-281-4/+7
| |\ \
| | * | Fix WebSocketApp on_close handling to support statusCode and reasonAaron Davidson2018-09-131-4/+7
| | | |
* | | | Merge branch 'master' of https://github.com/websocket-client/websocket-clientliris2018-10-282-5/+5
|\ \ \ \ | |/ / /
| * | | Merge pull request #485 from instance01/suppress_origin_fixliris2018-10-282-5/+5
| |\ \ \ | | | | | | | | | | Fix typo in supress_origin
| | * \ \ Merge branch 'master' into suppress_origin_fixliris2018-10-288-29/+62
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Fix typo in supress_originInstance2018-09-222-5/+5
| | |/ /
* | | | add docsliris2018-10-281-0/+1
|/ / /
* | | add docs=liris2018-10-281-0/+1
| | |