Skip to content

Commit 30ee333

Browse files
Match the server encoding when decoding HTTP response (#883)
1 parent 0f8db09 commit 30ee333

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

java/src/main/java/com/genexus/internet/HttpClientJavaLib.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.net.InetAddress;
55
import java.net.URISyntaxException;
66
import java.net.UnknownHostException;
7+
import java.nio.charset.Charset;
78
import java.nio.charset.StandardCharsets;
89
import java.security.KeyManagementException;
910
import java.security.KeyStoreException;
@@ -21,6 +22,7 @@
2122
import org.apache.http.client.config.CookieSpecs;
2223
import org.apache.http.conn.routing.HttpRoute;
2324
import org.apache.http.conn.ssl.NoopHostnameVerifier;
25+
import org.apache.http.entity.ContentType;
2426
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
2527
import org.apache.http.protocol.HttpContext;
2628
import org.apache.http.auth.AuthSchemeProvider;
@@ -723,7 +725,11 @@ public String getString() {
723725
return "";
724726
try {
725727
this.setEntity();
726-
String res = EntityUtils.toString(entity, "UTF-8");
728+
Charset charset = ContentType.getOrDefault(entity).getCharset();
729+
if (charset == null) {
730+
charset = StandardCharsets.UTF_8;
731+
}
732+
String res = EntityUtils.toString(entity, charset);
727733
eof = true;
728734
return res;
729735
} catch (IOException e) {

0 commit comments

Comments
 (0)