aboutsummaryrefslogtreecommitdiff
path: root/okhttp-backend
diff options
context:
space:
mode:
Diffstat (limited to 'okhttp-backend')
-rw-r--r--okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpBackend.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpBackend.scala b/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpBackend.scala
index a4b6b54..650d179 100644
--- a/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpBackend.scala
+++ b/okhttp-backend/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpBackend.scala
@@ -117,8 +117,11 @@ abstract class OkHttpBackend[R[_], S](client: OkHttpClient,
case IgnoreResponse =>
Try(res.close())
case ResponseAsString(encoding) =>
+ val charset = Option(res.header(ContentTypeHeader))
+ .flatMap(encodingFromContentType)
+ .getOrElse(encoding)
val body = Try(
- res.body().source().readString(Charset.forName(encoding)))
+ res.body().source().readString(Charset.forName(charset)))
res.close()
body
case ResponseAsByteArray =>