]> cat aescling's git repositories - mastodon.git/commitdiff
Disable inflate gzip on head method (#7432)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Thu, 10 May 2018 12:36:12 +0000 (21:36 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 10 May 2018 12:36:12 +0000 (14:36 +0200)
app/lib/request.rb

index fc7d398e04ebdb7a002d3bafb5000825ed8a6ae4..731bf76879d79159669009bb3d3de42096a74f52 100644 (file)
@@ -51,16 +51,17 @@ class Request
   end
 
   def headers
-    (@account ? @headers.merge('Signature' => signature) : @headers).reverse_merge('Accept-Encoding' => 'gzip').without(REQUEST_TARGET)
+    (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
   end
 
   private
 
   def set_common_headers!
-    @headers[REQUEST_TARGET] = "#{@verb} #{@url.path}"
-    @headers['User-Agent']   = user_agent
-    @headers['Host']         = @url.host
-    @headers['Date']         = Time.now.utc.httpdate
+    @headers[REQUEST_TARGET]    = "#{@verb} #{@url.path}"
+    @headers['User-Agent']      = user_agent
+    @headers['Host']            = @url.host
+    @headers['Date']            = Time.now.utc.httpdate
+    @headers['Accept-Encoding'] = 'gzip' if @verb != :head
   end
 
   def set_digest!