diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http.rb | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Nov 28 16:43:20 2014 Eric Hodel <drbrain@segment7.net> + + * lib/net/http.rb: Do not attempt SSL session resumption when the + session is expired. [Bug #10533] + Fri Nov 28 16:36:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (symbol_list): fix the node type of literal symbol list diff --git a/lib/net/http.rb b/lib/net/http.rb index a63be7f9a0..1e481ed366 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -912,7 +912,10 @@ module Net #:nodoc: @socket.write(buf) HTTPResponse.read_new(@socket).value end - s.session = @ssl_session if @ssl_session + if @ssl_session and + Time.now < @ssl_session.time + @ssl_session.timeout + s.session = @ssl_session if @ssl_session + end # Server Name Indication (SNI) RFC 3546 s.hostname = @address if s.respond_to? :hostname= Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect } @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-11-28" -#define RUBY_PATCHLEVEL 605 +#define RUBY_PATCHLEVEL 606 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 11 |