Merge pull request #106 from fcheung/content_encoding_redux

Another attempt to solve content-encoding header issues
fog · May 7, 2015 · 818c8e1 · 818c8e1
2 parents d3b3f68 + d2287ba
commit 818c8e1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
@@ -562,10 +562,10 @@ def request(params, &block)
               params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
               params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
 
-              if params[:headers]['Content-Encoding']
-                encoding = "aws-chunked, #{params[:headers]['Content-Encoding']}"
+              if params[:headers]['Content-Encoding'] && params[:headers]['Content-Encoding'].to_s.length > 0
+                encoding = "aws-chunked,#{params[:headers]['Content-Encoding']}"
               else
-                encoding = "aws-chunked, identity"
+                encoding = "aws-chunked"
               end
 
               params[:headers]['Content-Encoding']  = encoding