usa	2014-11-28 16:44:24 +0900 (Fri, 28 Nov 2014)

  New Revision: 48636

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48636

  Log:
    merge revision(s) 48563: [Backport #10533]
    
    * lib/net/http.rb:  Do not attempt SSL session resumption when the
      session is expired.  [Bug #10533]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/net/http.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 48635)
+++ ruby_2_0_0/ChangeLog	(revision 48636)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Nov 28 16:43:20 2014  Eric Hodel  <drbrain@s...>
+
+	* 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@r...>
 
 	* parse.y (symbol_list): fix the node type of literal symbol list
Index: ruby_2_0_0/lib/net/http.rb
===================================================================
--- ruby_2_0_0/lib/net/http.rb	(revision 48635)
+++ ruby_2_0_0/lib/net/http.rb	(revision 48636)
@@ -912,7 +912,10 @@ module Net   #:nodoc: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/net/http.rb#L912
             @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 }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 48635)
+++ ruby_2_0_0/version.h	(revision 48636)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48563


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/