Fix Ruby 1.8 issues

vzmind · Mar 10, 2011 · 76f9a7c · 76f9a7c
1 parent cccb641
commit 76f9a7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/net/backports.rb b/lib/net/backports.rb
@@ -1,3 +1,5 @@
+require "stringio"
+
 class StringIO
   def read_nonblock(*args)
     val = read(*args)

diff --git a/lib/net/http.rb b/lib/net/http.rb
@@ -755,6 +755,8 @@ def connect
       if use_ssl?
         ssl_parameters = Hash.new
         iv_list = instance_variables
+        iv_list = iv_list.map { |name| name.to_sym } unless iv_list.first.is_a?(Symbol)
+
         SSL_ATTRIBUTES.each do |name|
           ivname = "@#{name}".intern
           if iv_list.include?(ivname) and

diff --git a/test/test_https.rb b/test/test_https.rb
@@ -3,8 +3,8 @@
   require 'net/https'
   require 'stringio'
   require 'timeout'
-  require File.expand_path("../../openssl/utils", File.dirname(__FILE__))
-  require File.expand_path("utils", File.dirname(__FILE__))
+  require 'openssl/utils'
+  require 'utils'
 rescue LoadError
   # should skip this test
 end