summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:44:24 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:44:24 +0000
commitdd7f1cdfbd8215ee46c11175bfd2f4fd3569f34a (patch)
tree9f947cbbc3d0ff21012c918a34f6b202719e51e2 /ChangeLog
parent3f23ee7015448fbc33515dd8168c7b4d370c26e4 (diff)
merge revision(s) 48563: [Backport #10533]
* lib/net/http.rb: Do not attempt SSL session resumption when the session is expired. [Bug #10533] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cf823f31e..1aea7c0968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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