summaryrefslogtreecommitdiff
path: root/websocket/_http.py
Commit message (Collapse)AuthorAgeFilesLines
* Fix #526 by reverting invalid BSD license migration in commit e94ed9e to ↵engn33r2021-02-221-2/+1
| | | | return to LGPL2.1
* Merge branch 'master' into masterliris2019-12-251-2/+5
|\
| * 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`.
| * | Fix getting 400 bad request with long proxy authorization stringtruong.hua2019-12-021-1/+1
| |/
* | Pep8 fixesazaugg2019-04-241-1/+2
|/
* 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
* | fixed errorliris2019-02-231-1/+2
|/
* fixed #497 proxy issuev0.54.0liris2018-11-011-1/+1
|
* Miscellaneous code cleanupInstance2018-09-221-1/+1
|
* Merge pull request #427 from element-82/masterliris2018-05-271-1/+5
|\ | | | | _http.py: fix windows proxy error due to socktype
| * _http.py: fix windows proxy error due to socktypePaul Barrette2018-05-041-1/+5
| | | | | | | | | | | | | | | | | | | | Resolves #426 When running on windows 10 with a proxy, there is a connect error: _on_error: exception Socket type must be stream or datagram, not 0 This commit fixes that issue. Signed-off-by: Paul Barrette <paulbarrette@gmail.com>
* | Merge pull request #417 from jhtitor/masterliris2018-05-271-1/+56
|\ \ | | | | | | socks5 via pysocks support
| * | Add pysocks support.jhtitor2018-03-301-1/+56
| |/
* | Merge pull request #415 from minus7/masterliris2018-05-271-8/+11
|\ \ | | | | | | Load system default certificates if none are given
| * | Remove bundled cacert.pemminus2018-03-211-7/+5
| | |
| * | 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 #409 from hugobordigoni/masterliris2018-05-271-1/+1
|\ \ | | | | | | fix #408
| * | fix #408Hugo Bordigoni2018-03-011-1/+1
| |/
* | Fix the issue that websocket status message may not presentKevin Wang2018-02-221-1/+2
|/
* Added status message when HTTP can't be upgraded to WSDmitry Mottl2018-02-141-2/+4
|
* 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.
* 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-091-8/+11
|\ \ | | | | | | | | | into willstott101-gaierror
| * | Wrap socket.gaierror with subclass of WebsocketExceptionWill Stott2017-09-141-8/+11
| |/
* | 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
| |/
* | 0.44.1ukwksk2017-11-131-1/+2
| |
* | sslopt dict ca_cert should be ca_certs, fixes #334Philippe Mathieu2017-08-221-1/+1
|/ | | Was 2/3 fixed in commits 287db85 and c280375.
* renames key in sslopt dict, fixes #326Ankur Oberoi2017-06-221-1/+1
| | | must use the same key in the `sslopt` dictionary when reading and writing to it
* fixed #326liris2017-06-211-2/+2
|
* Support WEBSOCKET_CLIENT_CA_BUNDLE being directoryAlex Tzonkov2017-03-231-3/+6
| | | This PR adds the capability to use a directory with multiple certs to do ssl cert verification. Similar to how the requests module uses REQUESTS_CA_BUNDLE.
* fixed #264liris2016-12-021-1/+1
|
* Support CA bundle specified by environment variableImre Farkas2016-11-151-2/+5
| | | | | | | There's currently no way to define a custom list of trusted CAs and certain uses-cases end up in SSLError. This commit adds a check for the WEBSOCKET_CLIENT_CA_BUNDLE env variable, similarly to requests library which accepts REQUETS_CA_BUNDLE.
* wsdump, test_fuzzingclient, websocket.*, test_websocket: Organise importsAllan Lewis2016-04-271-9/+9
| | | | | | | | | | | | | | Previously, because of the multiple instances of `from foo import *`, names were imported from modules that had themselves imported them, instead of from the place of definition. This commit therefore does the following: - Declares `__all__` in every module that imports anything, so that `from foo import *` is sane. - Sorts the imports based on conventions, similar to the output of `isort`. - Places all conditional imports after unconditional imports, except where that isn't valid. - Imports local names from the modules where they are defined, except when importing the package itself.
* websocket.*: [PEP 8] Use conventional line-length limitAllan Lewis2016-04-271-4/+8
| | | | Line length is set to 80 characters; tests are excluded.
* wsdump, websocket.*: [PEP 8] Use conventional vertical spacingAllan Lewis2016-04-271-2/+7
|
* wsdump, examples, setup, _abnf, _http, _utils: [PEP 8] Fix spacingAllan Lewis2016-04-271-3/+3
|
* _abnf, _app, _http, _url: [PEP 8] Fix indentsAllan Lewis2016-04-271-2/+2
|
* wsdump, _abnf, _http: Compare to `None` using `in`Allan Lewis2016-04-271-1/+1
|
* fixed #227liris2016-01-041-3/+5
|
* Use pre-initialized stream socketIlya Semyonov2015-12-081-1/+5
| | | | | Allow creating WebSocket connection on existing stream socket instance (either TCP or SSL).
* Fix issue #207, Client certificates do not work with 2.7.9+ and 3.2+robviaas2015-09-201-0/+6
| | | | | | | | | | (https://github.com/liris/websocket-client/issues/207) By observing the certfile argument, we can load the cert chain using the certfile, keyfile and password sslopt values. A more complete fix might allow us to pass in the SSLContext (rather than creating it on each connection), which would allow the caller to set all SSL options prior to calling create_connection() - this option was passed over as it required more extensive changes.
* add space.liris2015-07-231-1/+1
|
* Merge branch 'master' of https://github.com/newsham/websocket-client into ↵liris2015-07-231-0/+3
|\ | | | | | | newsham-master