1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/net/http.rb: Do not attempt SSL session resumption when the

Browse Source 
session is expired.  [Bug #10533]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2014-11-25 07:09:48 +00:00
parent 49cb41192a
commit 711ece42cd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Nov 25 16:09:28 2014 Eric Hodel <drbrain@segment7.net>
* lib/net/http.rb: Do not attempt SSL session resumption when the
session is expired. [Bug #10533]
Tue Nov 25 15:59:46 2014 Eric Hodel <drbrain@segment7.net> Tue Nov 25 15:59:46 2014 Eric Hodel <drbrain@segment7.net>
* lib/rake: Update to rake 10.4.0 * lib/rake: Update to rake 10.4.0

5
lib/net/http.rb
View File

@ -914,7 +914,10 @@ module Net #:nodoc:
@socket.write(buf) @socket.write(buf)
HTTPResponse.read_new(@socket).value HTTPResponse.read_new(@socket).value
end 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 # Server Name Indication (SNI) RFC 3546
s.hostname = @address if s.respond_to? :hostname= s.hostname = @address if s.respond_to? :hostname=
Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect } Timeout.timeout(@open_timeout, Net::OpenTimeout) { s.connect }