From 2de3e615f446573560809eb4c8d09d6a2d1766b2 Mon Sep 17 00:00:00 2001
From: Daniil Fedotov <dfedotov@pivotal.io>
Date: Thu, 28 Apr 2016 16:07:42 +0100
Subject: [PATCH] Remove content-encoding header from error responses

---
 .../src/rabbit_webmachine_error_handler.erl              | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/deps/rabbitmq_web_dispatch/src/rabbit_webmachine_error_handler.erl b/deps/rabbitmq_web_dispatch/src/rabbit_webmachine_error_handler.erl
index acbd4d151b..3d11529bf0 100644
--- a/deps/rabbitmq_web_dispatch/src/rabbit_webmachine_error_handler.erl
+++ b/deps/rabbitmq_web_dispatch/src/rabbit_webmachine_error_handler.erl
@@ -28,8 +28,13 @@
 
 render_error(Code, Req, Reason) ->
     case Req:has_response_body() of
-        {true, _}  -> maybe_log(Req, Reason),
-                      Req:response_body();
+        {true, _}  ->
+            maybe_log(Req, Reason),
+            {Body, ReqState0} = Req:response_body(),
+            {ok, ReqState} =
+                webmachine_request:remove_response_header("Content-Encoding",
+                                                          ReqState0),
+            {Body, ReqState};
         {false, _} -> render_error_body(Code, Req:trim_state(), Reason)
     end.