@@ -280,10 +280,9 @@ private static void CleanHeaders(IDictionary<string, string> headers)
280
280
headers . Remove ( HeaderKeys . AuthorizationHeader ) ;
281
281
headers . Remove ( HeaderKeys . XAmzContentSha256Header ) ;
282
282
283
- if ( headers . ContainsKey ( HeaderKeys . XAmzDecodedContentLengthHeader ) )
283
+ if ( headers . TryGetValue ( HeaderKeys . XAmzDecodedContentLengthHeader , out string decodedContentLength ) )
284
284
{
285
- headers [ HeaderKeys . ContentLengthHeader ] =
286
- headers [ HeaderKeys . XAmzDecodedContentLengthHeader ] ;
285
+ headers [ HeaderKeys . ContentLengthHeader ] = decodedContentLength ;
287
286
headers . Remove ( HeaderKeys . XAmzDecodedContentLengthHeader ) ;
288
287
}
289
288
}
@@ -507,13 +506,13 @@ public static string SetRequestBodyHash(IRequest request, bool signPayload, stri
507
506
{
508
507
computedContentHash = chunkedBodyHash ;
509
508
510
- if ( request . Headers . ContainsKey ( HeaderKeys . ContentLengthHeader ) )
509
+ if ( request . Headers . TryGetValue ( HeaderKeys . ContentLengthHeader , out string contentLength ) )
511
510
{
512
511
// Set X-Amz-Decoded-Content-Length with the true size of the data
513
- request . Headers [ HeaderKeys . XAmzDecodedContentLengthHeader ] = request . Headers [ HeaderKeys . ContentLengthHeader ] ;
512
+ request . Headers [ HeaderKeys . XAmzDecodedContentLengthHeader ] = contentLength ;
514
513
515
514
// Substitute the originally declared content length with the inflated length due to chunking metadata and/or trailing headers
516
- var originalContentLength = long . Parse ( request . Headers [ HeaderKeys . ContentLengthHeader ] , CultureInfo . InvariantCulture ) ;
515
+ var originalContentLength = long . Parse ( contentLength , CultureInfo . InvariantCulture ) ;
517
516
request . Headers [ HeaderKeys . ContentLengthHeader ]
518
517
= ChunkedUploadWrapperStream . ComputeChunkedContentLength ( originalContentLength , signatureLength , request . TrailingHeaders , request . SelectedChecksum ) . ToString ( CultureInfo . InvariantCulture ) ;
519
518
}
0 commit comments