From 227e1d6f4433a15dfc3529bac8387540945009cf Mon Sep 17 00:00:00 2001 From: adamw Date: Wed, 30 Aug 2017 13:33:18 +0200 Subject: Implementing multi-part uploads for the http url connection backend --- .../scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'okhttp-client-handler') diff --git a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala index 6bef4fa..7388bb1 100644 --- a/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala +++ b/okhttp-client-handler/src/main/scala/com/softwaremill/sttp/okhttp/OkHttpClientHandler.scala @@ -1,7 +1,6 @@ package com.softwaremill.sttp.okhttp import java.io.IOException -import java.net.URLEncoder import java.nio.charset.Charset import com.softwaremill.sttp._ @@ -77,10 +76,7 @@ abstract class OkHttpClientHandler[R[_], S](client: OkHttpClient) private def addMultipart(builder: OkHttpMultipartBody.Builder, mp: Multipart): Unit = { - val disposition = s"""form-data; name="${URLEncoder.encode(mp.name, Utf8)}"""" + - mp.fileName.fold("")(fn => - s"""; filename="${URLEncoder.encode(fn, Utf8)}"""") - val allHeaders = mp.additionalHeaders + ("Content-Disposition" -> disposition) + val allHeaders = mp.additionalHeaders + (ContentDispositionHeader -> mp.contentDispositionHeaderValue) val headers = Headers.of(allHeaders.asJava) bodyToOkHttp(mp.body).foreach(builder.addPart(headers, _)) -- cgit v1.2.3