Browse Source

Fix issuse #1721 Accept-Encoding header is added twice (#2139)

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

* format core code
pull/2142/head
iZDT 1 year ago committed by GitHub
parent
commit
ba009a0bd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      core/src/main/java/feign/Client.java
  2. 4
      core/src/main/java/feign/Util.java

6
core/src/main/java/feign/Client.java

@ -14,6 +14,7 @@ @@ -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 @@ public interface Client { @@ -186,6 +187,11 @@ public interface Client {
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);
}

4
core/src/main/java/feign/Util.java

@ -64,6 +64,10 @@ public class Util { @@ -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.
*/

Loading…
Cancel
Save