Fix issuse OpenFeign#1721 Accept-Encoding header is added twice

izdt · Jul 26, 2023 · 8d3cb65 · 8d3cb65
1 parent a84f90c
commit 8d3cb65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/core/src/main/java/feign/Client.java b/core/src/main/java/feign/Client.java
@@ -14,6 +14,7 @@
 package feign;
 
 import static feign.Util.CONTENT_ENCODING;
+import static feign.Util.ACCEPT_ENCODING;
 import static feign.Util.CONTENT_LENGTH;
 import static feign.Util.ENCODING_DEFLATE;
 import static feign.Util.ENCODING_GZIP;
@@ -186,6 +187,11 @@ HttpURLConnection convertAndSend(Request request, Options options) throws IOExce
               contentLength = Integer.valueOf(value);
               connection.addRequestProperty(field, value);
             }
+          }
+          //Avoid add "Accept-encoding" twice or more when "compression" option is enabled
+          if (field.equals(ACCEPT_ENCODING)) {
+            connection.addRequestProperty(field, String.join(", ", request.headers().get(field)));
+            break;
           } else {
             connection.addRequestProperty(field, value);
           }

diff --git a/core/src/main/java/feign/Util.java b/core/src/main/java/feign/Util.java
@@ -64,6 +64,10 @@ public class Util {
    * The HTTP Content-Encoding header field name.
    */
   public static final String CONTENT_ENCODING = "Content-Encoding";
+  /**
+   * The HTTP Accept-Encoding header field name.
+   */
+  public static final String ACCEPT_ENCODING = "Accept-Encoding";
   /**
    * The HTTP Retry-After header field name.
    */