From 573fa7a25ee7b80e01c7b5f5214cbee7325691e7 Mon Sep 17 00:00:00 2001 From: Christian Fazzini Date: Fri, 13 Jan 2012 13:34:56 +0800 Subject: [PATCH] To allow passing query parameters such as response-content-disposition --- lib/s3/s3_interface.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/s3/s3_interface.rb b/lib/s3/s3_interface.rb index 4c8e4b7..68ec1d7 100644 --- a/lib/s3/s3_interface.rb +++ b/lib/s3/s3_interface.rb @@ -106,7 +106,11 @@ def canonical_string(method, path, headers={}, expires=nil) # :nodoc: out_string << (key[/^#{AMAZON_HEADER_PREFIX}/o] ? "#{key}:#{value}\n" : "#{value}\n") end # ignore everything after the question mark... - out_string << path.gsub(/\?.*$/, '') + #out_string << path.gsub(/\?.*$/, '') + + # To allow passing query parameters such as response-content-disposition + out_string << path + # ...unless there is an acl or torrent parameter out_string << '?acl' if path[/[&?]acl($|&|=)/] out_string << '?policy' if path[/[&?]policy($|&|=)/]