summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
author脇坂 友貴 <yuki.wakisaka@bizreach.co.jp>2018-02-01 02:47:50 +0900
committer脇坂 友貴 <yuki.wakisaka@bizreach.co.jp>2018-02-01 02:47:50 +0900
commit9cb413f13f5053d9642d98c99dcf38b0a71af6ee (patch)
treed1994f59b9d80a42f9c1f80d18134e822ad5e607 /ChangeLog
parent1167f0729917c3255a1e56092ed692260d85876d (diff)
parentab77e07f88191c050f10fbb4f223723476b94266 (diff)
downloadwebsocket-client-9cb413f13f5053d9642d98c99dcf38b0a71af6ee.tar.gz
Merge branch 'fix_ssl_recv_time_out' of https://github.com/trozet/websocket-client into trozet-fix_ssl_recv_time_out
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c40215a..76fb567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
ChangeLog
============
+- 0.48.0
+
+ -Fix detecting timeouts with SSL in recv (#387)
+
- 0.47.0
- Fix socket constructor in _open_socket to use all relevant variables from getaddrinfo. (#383)