summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-05 06:47:36 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-05 06:47:36 +0000
commit73b3b10d8db30d3c6b7c53ae0da64c39b55d899f (patch)
tree7a0709fd17b8430fece4f45becf9b89b5563d3a5 /ChangeLog
parent19c749f61c83d1c360ed8ca8d5a80e62951ee4b9 (diff)
downloadruby-73b3b10d8db30d3c6b7c53ae0da64c39b55d899f.tar.gz
* lib/net/smtp.rb (tlsconnect): support timeout for TLS handshake.
[ruby-core:76893] [Bug #12678] * lib/net/protocol.rb (ssl_socket_connect): new method to implement timeout for TLS handshake. * lib/net/http.rb (connect): use Net::Protocol#ssl_socket_connect. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog10
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e8c0e97cb7..dfaddfa7ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Nov 5 15:42:52 2016 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/smtp.rb (tlsconnect): support timeout for TLS handshake.
+ [ruby-core:76893] [Bug #12678]
+
+ * lib/net/protocol.rb (ssl_socket_connect): new method to implement
+ timeout for TLS handshake.
+
+ * lib/net/http.rb (connect): use Net::Protocol#ssl_socket_connect.
+
Sat Nov 5 14:17:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (brace_body, do_body): since cmdarg_stack is saved in