mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Merge pull request #995 from m0use/bugfix-persistent-conn
Fixed non-persistent connections handling with AWS DNS
This commit is contained in:
commit
58e6f12a61
6 changed files with 6 additions and 6 deletions
|
@ -92,7 +92,7 @@ module Fog
|
|||
@connection_options = options[:connection_options] || {}
|
||||
@host = options[:host] || 'cloudfront.amazonaws.com'
|
||||
@path = options[:path] || '/'
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
@port = options[:port] || 443
|
||||
@scheme = options[:scheme] || 'https'
|
||||
@version = options[:version] || '2010-11-01'
|
||||
|
|
|
@ -95,7 +95,7 @@ module Fog
|
|||
@connection_options = options[:connection_options] || {}
|
||||
@host = options[:host] || 'route53.amazonaws.com'
|
||||
@path = options[:path] || '/'
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
@port = options[:port] || 443
|
||||
@scheme = options[:scheme] || 'https'
|
||||
@version = options[:version] || '2012-02-29'
|
||||
|
|
|
@ -284,7 +284,7 @@ module Fog
|
|||
"s3-#{options[:region]}.amazonaws.com"
|
||||
end
|
||||
@path = options[:path] || '/'
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
@port = options[:port] || 443
|
||||
@scheme = options[:scheme] || 'https'
|
||||
end
|
||||
|
|
|
@ -85,7 +85,7 @@ module Fog
|
|||
@dnsmadeeasy_secret_key = options[:dnsmadeeasy_secret_key]
|
||||
@connection_options = options[:connection_options] || {}
|
||||
@host = options[:host] || 'api.dnsmadeeasy.com'
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
@port = options[:port] || 80 #443 Not yet
|
||||
@scheme = options[:scheme] || 'http' #'https Not yet
|
||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
|
||||
|
|
|
@ -192,7 +192,7 @@ module Fog
|
|||
@connection_options = options[:connection_options] || {}
|
||||
@hmac = Fog::HMAC.new('sha1', @google_storage_secret_access_key)
|
||||
@host = options[:host] || 'commondatastorage.googleapis.com'
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
@port = options[:port] || 443
|
||||
@scheme = options[:scheme] || 'https'
|
||||
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
|
||||
|
|
|
@ -54,7 +54,7 @@ module Fog
|
|||
|
||||
@connection_options = options[:connection_options] || {}
|
||||
@hmac = Fog::HMAC.new('sha1', @ninefold_storage_secret_decoded)
|
||||
@persistent = options[:persistent] || true
|
||||
@persistent = options.fetch(:persistent, true)
|
||||
|
||||
@connection = Fog::Connection.new("#{Fog::Storage::Ninefold::STORAGE_SCHEME}://#{Fog::Storage::Ninefold::STORAGE_HOST}:#{Fog::Storage::Ninefold::STORAGE_PORT}", @persistent, @connection_options)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue