Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Fix Multipart Upload with WinSCP (#164) #193

Merged
lx merged 2 commits from KokaKiwi/garage:fix-164 into main 2022-01-17 10:18:41 +00:00
Conversation 1 Commits 2 Files changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9a22c9905b - Show all commits

4
src/api/s3_put.rs
View file

@ -511,7 +511,7 @@ pub async fn handle_complete_multipart_upload(
} }
let body_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?; let body_xml = roxmltree::Document::parse(std::str::from_utf8(&body)?)?;
let body_list_of_parts = parse_complete_multpart_upload_body(&body_xml) let body_list_of_parts = parse_complete_multipart_upload_body(&body_xml)
.ok_or_bad_request("Invalid CompleteMultipartUpload XML")?; .ok_or_bad_request("Invalid CompleteMultipartUpload XML")?;
debug!( debug!(
"CompleteMultipartUpload list of parts: {:?}", "CompleteMultipartUpload list of parts: {:?}",
@ -703,7 +703,7 @@ struct CompleteMultipartUploadPart {
part_number: u64, part_number: u64,
} }
fn parse_complete_multpart_upload_body( fn parse_complete_multipart_upload_body(
xml: &roxmltree::Document, xml: &roxmltree::Document,
) -> Option<Vec<CompleteMultipartUploadPart>> { ) -> Option<Vec<CompleteMultipartUploadPart>> {
let mut parts = vec![]; let mut parts = vec![];