Skip to content

1.Modify the Etag flag to accommodate Baidu Cloud Object Storage. #18

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

1.Modify the Etag flag to accommodate Baidu Cloud Object Storage. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/aws/s3/s3client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ impl<P, D> S3Client<P, D>
let cache_control = try!(S3Client::<P,D>::get_value_for_header("Cache-Control".to_string(), response));

let content_length_string = try!(S3Client::<P,D>::get_value_for_header("Content-Length".to_string(), response));
let content_length = try!(content_length_string.parse::<i32>());
let content_length = try!(content_length_string.parse::<i64>());

let expiration = try!(S3Client::<P,D>::get_value_for_header("x-amz-expiration".to_string(), response));
let missing_meta_string = try!(S3Client::<P,D>::get_value_for_header("x-amz-missing-meta".to_string(), response));
Expand All @@ -1279,7 +1279,10 @@ impl<P, D> S3Client<P, D>
let content_type = try!(S3Client::<P,D>::get_value_for_header("Content-Type".to_string(), response));
let content_language = try!(S3Client::<P,D>::get_value_for_header("Content-Language".to_string(), response));
let version_id = try!(S3Client::<P,D>::get_value_for_header("x-amz-version-id".to_string(), response));
let e_tag = try!(S3Client::<P,D>::get_value_for_header("ETag".to_string(), response));
let mut e_tag = try!(S3Client::<P,D>::get_value_for_header("Etag".to_string(), response));
if e_tag.is_empty() {
e_tag = try!(S3Client::<P,D>::get_value_for_header("ETag".to_string(), response));
}
let sse_customer_key_md5 = try!(S3Client::<P,D>::get_value_for_header("x-amz-server-side-encryption-customer-key-MD5".to_string(), response));
// make the object to return
let head_object = HeadObjectOutput {
Expand Down Expand Up @@ -1346,7 +1349,7 @@ impl<P, D> S3Client<P, D>
let cache_control = try!(S3Client::<P, D>::get_value_for_header("Cache-Control".to_string(), response));
let content_length_string = try!(S3Client::<P, D>::get_value_for_header("Content-Length".to_string(),
response));
let content_length = try!(content_length_string.parse::<i32>());
let content_length = try!(content_length_string.parse::<i64>());
let expiration = try!(S3Client::<P, D>::get_value_for_header("x-amz-expiration".to_string(), response));
let missing_meta_string = try!(S3Client::<P, D>::get_value_for_header("x-amz-missing-meta".to_string(),
response));
Expand All @@ -1363,7 +1366,12 @@ impl<P, D> S3Client<P, D>
let content_type = try!(S3Client::<P, D>::get_value_for_header("Content-Type".to_string(), response));
let content_language = try!(S3Client::<P, D>::get_value_for_header("Content-Language".to_string(), response));
let version_id = try!(S3Client::<P, D>::get_value_for_header("x-amz-version-id".to_string(), response));
let e_tag = try!(S3Client::<P, D>::get_value_for_header("ETag".to_string(), response));

let mut e_tag = try!(S3Client::<P, D>::get_value_for_header("ETag".to_string(), response));
if e_tag.is_empty() {
e_tag = try!(S3Client::<P, D>::get_value_for_header("Etag".to_string(), response));
}

let sse_customer_key_md5 =
try!(S3Client::<P, D>::get_value_for_header("x-amz-server-side-encryption-customer-key-MD5".to_string(),
response));
Expand Down Expand Up @@ -1625,7 +1633,12 @@ impl<P, D> S3Client<P, D>

match status {
200 => {
match result.headers.get("ETag") {
let mut etag = result.headers.get("ETag");
if etag == None {
etag = result.headers.get("Etag");
}

match etag {
Some(ref value) => Ok(value.to_string()),
None => Err(S3Error::new("Couldn't find etag in response headers.")),
}
Expand Down
4 changes: 2 additions & 2 deletions src/aws/s3/writeparse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3076,14 +3076,14 @@ impl TransitionStorageClassWriter {
}
}

pub type ContentLength = i32;
pub type ContentLength = i64;
/// Parse `ContentLength` from XML
pub struct ContentLengthParser;

impl ContentLengthParser {
pub fn parse_xml<T: Peek + Next>(tag_name: &str, stack: &mut T) -> Result<ContentLength, XmlParseError> {
try!(start_element(tag_name, stack));
let obj = i32::from_str(try!(characters(stack)).as_ref()).unwrap();
let obj = i64::from_str(try!(characters(stack)).as_ref()).unwrap();
try!(end_element(tag_name, stack));
Ok(obj)
}
Expand Down