@@ -63,7 +63,7 @@ module AWS path = self.class.prepare_path(path) request = request_method(:get).new(path, {}) query_string = query_string_authentication(request, current_host, options) - returning "#{protocol(options)}#{http.address}#{port_string}#{path}" do |url| + returning "#{protocol(options)}#{get_host(current_host)}#{port_string}#{path}" do |url| url << "?#{query_string}" if authenticate end end @@ -129,7 +129,11 @@ module AWS end def set_host!(request, host) - request['Host'] = (host && http.address.match(host)) ? http.address : host.nil? ? http.address : host.match(/amazonaws.com/) ? host : "#{host}.#{http.address}" + request['Host'] = get_host(host) + end + + def get_host(host) + (host && http.address.match(host)) ? http.address : host.nil? ? http.address : host.match(/amazonaws.com/) ? host : "#{host}.#{http.address}" end def query_string_authentication(request, current_host, options = {}) lib/aws/s3/connection.rb c1e0e9fe8988ffd9c4acb1fe0c16b56f74a8f171 Lars Pind lars@pinds.com http://github.com/isaacfeliu/aws-s3/commit/f8f41fe948cae8168e2390d1b513abf5f7d4a3bd f8f41fe948cae8168e2390d1b513abf5f7d4a3bd 2008-12-09T10:06:30-08:00 2008-12-09T10:06:30-08:00 Return a URL that uses the right host from url_for a5ba69732d9bffc1fe6a0fd43f3b55ada0696da0 Lars Pind lars@pinds.com