1 files changed, 5 insertions, 9 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
index 0cd0a0b7a..ce15b75bd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
@@ -659,18 +659,14 @@ private int tunnelRequest(HttpServletRequest req, HttpServletResponse resp, Map
     } else {
       Logger.debug("Resp header ---REMOVED--- " + headerKey + ": " + headerValue);
     }
-    if (isTransferEncodingChunkedHeader(headerKey, headerValue)) {
-      chunked = true;
-      transferEncodingKey = headerKey;
+    if (isTransferEncodingChunkedHeader(headerKey, headerValue) || "content-length".equalsIgnoreCase(headerKey)) {
+        respHeaders.remove(respHeader);
+        Logger.debug("Resp header " + headerKey + " REMOVED");
     }
-    if ("content-length".equalsIgnoreCase(headerKey))
-      contentLengthKey = headerKey;
+    
     i++;
   }
-  if (chunked && contentLengthKey != null) {
-    respHeaders.remove(transferEncodingKey);
-    Logger.debug("Resp header " + transferEncodingKey + " REMOVED");
-  }
+  
 
   String headerValue;
   String respHeader[] = new String[2];