Permalink
Browse files

Merge branch 'master' into public_right_aws

  • Loading branch information...
2 parents bdcd8e3 + 52ad779 commit d0f4580a4d1a2be4029dda696a5573d3d62f64e4 @konstantin-dzreev konstantin-dzreev committed Jan 17, 2012
Showing with 10 additions and 3 deletions.
  1. +7 −0 History.txt
  2. +1 −1 lib/awsbase/version.rb
  3. +2 −2 lib/s3/right_s3_interface.rb
View
@@ -327,3 +327,10 @@ the source key.
- SDB: ConsistentRead support
- bunch of micro bugs
+=== 3.0.1
+ Release Notes:
+ - Fixed:
+ - SignatureDoesNotMatch on file download via get_link()
+ - S3#bucket should not fail for non admin creds
+ - couple doc typos
+
View
@@ -2,7 +2,7 @@ module RightAws #:nodoc:
module VERSION #:nodoc:
MAJOR = 3 unless defined?(MAJOR)
MINOR = 0 unless defined?(MINOR)
- TINY = 0 unless defined?(TINY)
+ TINY = 1 unless defined?(TINY)
STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(STRING)
end
@@ -856,7 +856,7 @@ def get_object(bucket, key, headers={})
def generate_link(method, headers={}, expires=nil) #:nodoc:
# calculate request data
server, path, path_to_sign = fetch_request_params(headers)
- path_to_sign = CGI.unescape(path_to_sign)
+
# expiration time
expires ||= DEFAULT_EXPIRES_AFTER
expires = Time.now.utc + expires if expires.is_a?(Fixnum) && (expires < ONE_YEAR_IN_SECONDS)
@@ -950,7 +950,7 @@ def get_link(bucket, key, expires=nil, headers={}, response_params={})
else
response_params = ''
end
- generate_link('GET', headers.merge(:url=>"#{bucket}/#{CGI::escape key}#{response_params}"), expires)
+ generate_link('GET', headers.merge(:url=>"#{bucket}/#{URI::escape key}#{response_params}"), expires)
rescue
on_exception
end

0 comments on commit d0f4580

Please sign in to comment.