summaryrefslogtreecommitdiff
path: root/websocket
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #553 from spacewander/improve_readabilityliris2019-12-251-2/+3
|\ | | | | Improve the readability of HTTP status codes.
| * Improve the readability of HTTP status codes.spacewander2019-05-101-2/+3
| | | | | | | | | | This commit also changes the type of 'SUPPORTED_REDIRECT_STATUSES' to 'tuple'. It seems that this change doesn't break anything.
* | Merge pull request #566 from ↵liris2019-12-251-3/+6
|\ \ | | | | | | | | | | | | damjanstulicsonos/expose-http-connection-header-to-user Expose http connection header to user
| * | updated if statement to include check against NoneDamjan Stulic2019-08-071-1/+1
| | |
| * | removed extra white spaceDamjan Stulic2019-08-071-1/+0
| | |
| * | added support for allowing users to change connection headerDamjan Stulic2019-08-071-3/+7
| |/
* | Merge pull request #573 from devmonkey22/masterliris2019-12-251-5/+4
|\ \ | | | | | | Resolve issue opening socket to intranet on Windows 10 with no proxy settings but behind proxy
| * | Resolve issue opening socket to intranet on Windows 10 with no proxy ↵Mike D2019-09-161-5/+4
| |/ | | | | | | | | settings but behind proxy Fix for #571. Always provide `socket.SOCK_STREAM` to `socket.getaddrinfo`.
* | Merge pull request #577 from filips123/dummy-ssl-objectliris2019-12-251-0/+2
|\ \ | | | | | | Create dummy `ssl` object
| * | Create dummy `ssl` objectFilip Š2019-10-041-0/+2
| |/
* | Merge pull request #579 from lucashussey/patch-1liris2019-12-251-2/+2
|\ \ | | | | | | Fixed typo
| * | Fixed typoLucas Hussey2019-10-251-2/+2
| |/ | | | | Class name "SSLDispacther" had a typo, should be "SSLDispatcher". Fixed class definition, and instance creation (in create_dispatcher).
* | Merge pull request #584 from kube-HPC/add-condition-for-traceliris2019-12-252-3/+6
|\ \ | | | | | | avoid calling repr(data) if tracing is not enabled
| * | avoid calling repr(data) if tracing is not enabledYehiyam Livneh2019-11-242-3/+6
| |/
* | 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
* | 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
| |/
* | start release 0.57.0liris2019-12-251-1/+1
|/
* release 0.56.0v0.56.0liris2019-03-211-1/+1
|
* 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.
* | 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).
* | | fixed errorliris2019-02-231-1/+2
|/ /
* | Merge pull request #474 from ARMmbed/ssl-socket-fixliris2019-02-233-4/+51
|\ \ | |/ |/|
| * Fix SSL socket handling (#2)Juho Hovila2018-08-293-4/+51
| | | | | | | | | | | | | | | | | | | | * 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
* | 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-151-1/+1
| | |
* | | Add response header in WebSocketBadStatusExceptiontarma2018-11-052-2/+3
|/ /
* | fixed #497 proxy issuev0.54.0liris2018-11-011-1/+1
| |
* | 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' into suppress_origin_fixliris2018-10-285-13/+41
|\ \ \
| * \ \ Merge pull request #486 from instance01/proxy_typeliris2018-10-281-2/+3
| |\ \ \
| | * | | Make proxy_type option available in WebSocketApp.run_forever()Instance2018-09-221-2/+3
| | |/ /
| * | | Merge pull request #487 from instance01/pep8liris2018-10-282-6/+6
| |\ \ \
| | * | | Miscellaneous code cleanupInstance2018-09-222-6/+6
| | |/ /
| * | | Merge pull request #491 from partojkander/support-redirectliris2018-10-282-3/+24
| |\ \ \
| | * | | Handle PY3.4/3.5Pär Tojkander2018-10-111-1/+4
| | | | |
| | * | | Handle PY2/3Pär Tojkander2018-10-111-1/+5
| | | | |
| | * | | Rename 'redirect_threshold' to 'redirect_limit'Pär Tojkander2018-10-111-3/+3
| | | | |
| | * | | Handle redirects in handshakePär Tojkander2018-10-112-3/+17
| | |/ /
| * | | start v.0.54liris2018-10-281-1/+1
| | | |
| * | | Merge pull request #492 from Mottl/run-patchliris2018-10-281-0/+6
| |\ \ \
View Lorry Controller Status