diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 08:10:56 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-09 08:10:56 +0000 |
| commit | 87cacf7e686022e6c42e40f25abefa6bf0ccf841 (patch) | |
| tree | b1be1594e4ecf20a265948aa29d9d49ba37c1537 /version.h | |
| parent | f4a8004e315bb33017ba9d432fa78b3b605e70b0 (diff) | |
merge revision(s) 56576,56623: [Backport #12678] [Backport #13429]
* 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.
* test/net/smtp/test_smtp.rb (test_tls_connect, test_tls_connect):
use Socket.tcp_server_sockets in case localhost is resolved to ::1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.5" #define RUBY_RELEASE_DATE "2017-08-09" -#define RUBY_PATCHLEVEL 345 +#define RUBY_PATCHLEVEL 346 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 8 |