251 Commits

Author SHA1 Message Date
liris
e6ed0161ef python 2.6 support 2015-10-27 16:17:35 +09:00
liris
f2c2a4fa4f Merge branch 'tweaks' of https://github.com/nlevitt/websocket-client into nlevitt-tweaks 2015-10-27 15:50:35 +09:00
liris
e40203e906 Merge pull request #211 from obi1kenobi/master
Security improvements during handshake
2015-10-27 15:48:25 +09:00
liris
c6d4747495 Merge branch 'master' of https://github.com/robviaas/websocket-client into robviaas-master 2015-10-27 15:44:35 +09:00
liris
7fe8706fde ref #204
update document
2015-10-27 15:43:34 +09:00
Noah Levitt
79b5d23efc Merge remote-tracking branch 'origin/master' into tweaks
* origin/master:
  fixed #192 introduced close timeout
  fixed #199 WebSocketBadStatusException for handshake error
  fixed #198 introduce on_data callback to pass data type.
  documentation
  add space.
  Typo fix in README.rst
  Fix string formatting in exception
  add support for ssl cert chains to support client certs
2015-09-23 00:46:21 +00:00
Predrag Gruevski
896e7c7317 Using os.urandom() and constant-time hash check for handshake. Fixes #209 #210 2015-09-21 11:44:34 -04:00
robviaas
bc31edf48b Fix issue #207, Client certificates do not work with 2.7.9+ and 3.2+
(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.
2015-09-20 20:41:33 +00:00
DenisKolodin
0fdbb59a2a Map dict to headers list 2015-08-22 18:15:46 +03:00
liris
d00154724b fixed #192
introduced close timeout
2015-07-30 10:30:12 +09:00
liris
ec06e86588 fixed #199
WebSocketBadStatusException for handshake error
2015-07-30 09:31:36 +09:00
liris
0dcebf652b fixed #198
introduce on_data callback to pass data type.
2015-07-30 09:17:24 +09:00
liris
fd2bf764af add space. 2015-07-23 07:45:03 +09:00
liris
f9d57519ff Merge branch 'master' of https://github.com/newsham/websocket-client into newsham-master 2015-07-23 07:43:53 +09:00
Noah Levitt
44902a249c improve logging of error from callback 2015-07-20 16:05:41 -07:00
Craig Jellick
6410340fca Fix string formatting in exception 2015-07-17 13:49:28 -07:00
Tim Newsham
61cadf26ea add support for ssl cert chains to support client certs 2015-07-17 07:58:07 -10:00
Achille Roussel
f34c297091 use wsaccel if available 2015-07-10 11:55:05 -07:00
liris
dcf4eb6ef3 - fixed #190 2015-06-24 11:49:18 +09:00
liris
759d0e5749 - refactoring. 2015-06-22 09:42:37 +09:00
liris
41bd2d4d96 0.32.0 2015-05-29 08:03:17 +09:00
DainDwarf
54e8b2b8c3 Update _http.py
Return sock in _tunnel to avoid crash in connect()
2015-05-28 11:40:05 +02:00
liris
8f7a4c7fef fixed #179
pass all tests on pypy3 2.4.0
2015-05-07 09:27:52 +09:00
liris
2d0cfa5ee5 Merge branch 'travis' of https://github.com/jayvdb/websocket-client into jayvdb-travis 2015-05-07 09:04:00 +09:00
John Vandenberg
dc60c232f6 Add travis builds 2015-05-05 15:22:30 +10:00
John Vandenberg
306c4cb57d Fix #180: Avoid deprecated BaseException.message 2015-05-05 15:12:34 +10:00
liris
74f3f53897 start new project 2015-04-28 09:14:54 +09:00
liris
33b6f786c8 Merge branch 'master' of https://github.com/StuartAxelOwen/websocket-client into StuartAxelOwen-master 2015-04-21 09:21:10 +09:00
liris
e8920f6d9e add comment. 2015-04-21 09:17:28 +09:00
liris
578b57dbef set check_hostname attribute after setting verify_mode.
see b96a2e8fa7 (commitcomment-10803153) for detail.
refs b96a2e8fa765753e82eea531adb19716b52ca3ca
2015-04-21 09:15:18 +09:00
Stuart Axel Owen
266c6b0e79 Add __iter__, __next__, and next methods to WebSocket, allowing them to be iterated over. This means you can slice, map, filter, etc, websockets without having to roll your own generator each time. 2015-04-20 04:27:19 +00:00
liris
b96a2e8fa7 set check_hostname attribute before setiing verify_mode. 2015-04-20 10:25:11 +09:00
KenjiTakahashi
32e24181db Fix #175: Use builtin check_hostname when available 2015-04-20 02:23:51 +02:00
liris
9cc99f2ee2 fixed #175 2015-04-20 08:34:35 +09:00
KenjiTakahashi
d9bac67e8c Fix checking for SNI availability 2015-04-17 17:20:38 +02:00
liris
78c13538a4 fixed #173 2015-04-17 09:35:37 +09:00
liris
56c4e9c7c1 fix version check 2015-04-16 11:01:06 +09:00
liris
b37e7e0c7c fixed #171 2015-04-14 13:45:11 +09:00
liris
59d564fbd1 add some document.
small refactoring
2015-04-14 09:34:47 +09:00
KenjiTakahashi
2d4d387e6a Use SSLContext for socket wrapping when possible
Works for Python 2.7.9+ and 3.2+.
Enables usage of modern SSL extensions, like SNI.
2015-04-13 16:24:18 +02:00
liris
8b57599d56 start v0.30 and add document. 2015-04-08 10:22:02 +09:00
chrisdare04
74fca91e78 socket absent from read_headers call in proxy_info class 2015-04-07 15:51:03 +01:00
chrisdare04
418b1618d8 Minor type in proxy_info class 2015-04-07 15:47:50 +01:00
liris
55ef417645 enable ssl test 2015-04-01 12:19:15 +09:00
liris
4417e1dffe fixed ssl socket bug 2015-04-01 12:17:11 +09:00
liris
802bc13ee8 change version number 2015-04-01 10:11:50 +09:00
enewhuis
eda4645198 Fix erroneous argument shadowing 2015-03-31 19:59:44 -05:00
liris
bb5f395eb2 fixed some error 2015-03-26 15:50:47 +09:00
liris
f434416a1b refs #164 2015-03-26 15:06:34 +09:00
liris
c0b9ddb59e fixed #166 2015-03-26 07:56:43 +09:00