lib/S3_s3sync_mod.rb in moserp-s3sync-1.2.6 vs lib/S3_s3sync_mod.rb in moserp-s3sync-1.2.6.1
- old
+ new
@@ -58,11 +58,11 @@
# add support for streaming the response body to an IO stream
alias __make_request__ make_request
def make_request(method, bucket='', key='', path_args={}, headers={}, data='', metadata={}, streamOut=nil)
# build the path based on the calling format
- path = ''
+ path = "#{@virtual_path}"
if (not bucket.empty?) and (@calling_format == CallingFormat::REGULAR)
path << "/#{bucket}"
end
# add the slash after the bucket regardless
# the key will be appended if it is non-empty
@@ -78,10 +78,10 @@
set_headers(req, headers)
set_headers(req, metadata, METADATA_PREFIX)
set_headers(req, {'Connection' => 'keep-alive', 'Keep-Alive' => '300'})
- set_aws_auth_header(req, @aws_access_key_id, @aws_secret_access_key, bucket, key, path_args)
+ set_aws_auth_header(req, @aws_access_key_id, @aws_secret_access_key, @virtual_path, bucket, key, path_args)
http = $S3syncHttp
if req.request_body_permitted?
return http.request(req, data, streamOut)