diff --git a/lib/fog/cdn/aws.rb b/lib/fog/cdn/aws.rb index 679e992a6..0a5cb92ff 100644 --- a/lib/fog/cdn/aws.rb +++ b/lib/fog/cdn/aws.rb @@ -87,7 +87,10 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' @version = options[:version] || '2010-11-01' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true) + unless options.has_key?(:persistent) + options[:persistent] = true + end + @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]) end def reload diff --git a/lib/fog/dns/aws.rb b/lib/fog/dns/aws.rb index 025be7f69..ba4456b0a 100644 --- a/lib/fog/dns/aws.rb +++ b/lib/fog/dns/aws.rb @@ -92,7 +92,10 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' @version = options[:version] || '2010-10-01' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true) + unless options.has_key?(:persistent) + options[:persistent] = true + end + @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]) end def reload diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb index b75536f75..5730f32d0 100644 --- a/lib/fog/storage/aws.rb +++ b/lib/fog/storage/aws.rb @@ -220,7 +220,6 @@ module Fog end end - class Real include Utils extend Fog::Deprecation @@ -277,8 +276,11 @@ module Fog @path = options[:path] || '/' @port = options[:port] || 443 @scheme = options[:scheme] || 'https' + unless options.has_key?(:persistent) + options[:persistent] = true + end end - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true) + @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]) end def reload diff --git a/lib/fog/storage/google.rb b/lib/fog/storage/google.rb index 303da0151..d32c3a3d6 100644 --- a/lib/fog/storage/google.rb +++ b/lib/fog/storage/google.rb @@ -202,7 +202,10 @@ module Fog @host = options[:host] || 'commondatastorage.googleapis.com' @port = options[:port] || 443 @scheme = options[:scheme] || 'https' - @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true) + unless options.has_key?(:persistent) + options[:persistent] = true + end + @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent]) end def reload