about summary refs log tree commit homepage
path: root/lib/mogilefs/mogilefs.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mogilefs/mogilefs.rb')
-rw-r--r--lib/mogilefs/mogilefs.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/mogilefs/mogilefs.rb b/lib/mogilefs/mogilefs.rb
index d17f0b8..724dfb6 100644
--- a/lib/mogilefs/mogilefs.rb
+++ b/lib/mogilefs/mogilefs.rb
@@ -73,9 +73,9 @@ class MogileFS::MogileFS < MogileFS::Client
 
     @get_file_data_timeout = args[:get_file_data_timeout] || 5
     @new_file_max_time = args[:new_file_max_time] || 3600.0
-    @nhp_get = MogileFS::NHP.new('get')
+    @nhp_get = nhp_new('get')
     @nhp_get.open_timeout = @nhp_get.read_timeout = @get_file_data_timeout
-    @nhp_put = MogileFS::NHP.new('put')
+    @nhp_put = nhp_new('put')
     @nhp_put.open_timeout = @nhp_put.read_timeout = @new_file_max_time
 
     raise ArgumentError, "you must specify a domain" unless @domain
@@ -548,4 +548,11 @@ class MogileFS::MogileFS < MogileFS::Client
       end
     end
   end
+
+  def nhp_new(name) # :nodoc:
+    Net::HTTP::Persistent::VERSION.to_f >= 3.0 and name = { :name => name }
+    MogileFS::NHP.new(name)
+  rescue NameError
+    MogileFS::NHP.new(name)
+  end
 end