summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 48a0f3fd7f..2023dd9f9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 25 10:07:25 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * lib/net/http.rb: removed unused variable. It's removed at r13648.
+ [fix GH-1022] Patch by @nkondratyev
+
Fri Sep 25 09:48:27 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* gems/bundled_gems: upgrade to minitest-5.8.1
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 4db69b623b..0ec93752ce 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -656,7 +656,6 @@ module Net #:nodoc:
@use_ssl = false
@ssl_context = nil
@ssl_session = nil
- @enable_post_connection_check = true
@sspi_enabled = false
SSL_IVNAMES.each do |ivname|
instance_variable_set ivname, nil
@@ -1579,4 +1578,3 @@ require 'net/http/responses'
require 'net/http/proxy_delta'
require 'net/http/backward'
-