Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #1970 - update MultiPartFormDataContent to allow contentType override using optional builder #2003

Merged
merged 3 commits into from
Nov 23, 2021
Merged

fix #1970 - update MultiPartFormDataContent to allow contentType override using optional builder #2003

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a02dff0
allow contentType override using optional builder
jschneidereit Jul 22, 2020
9464407
move boundary and contentType to MultiPartFormDataContent ctor
jschneidereit Jul 24, 2020
d04c70a
Merge branch 'master' into fix-1970-atttempt-2
jschneidereit Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions ktor-client/ktor-client-core/common/src/io/ktor/client/request/forms/FormDataContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ public class FormDataContent(
override fun bytes(): ByteArray = content
}


/**
* [OutgoingContent] for multipart/form-data formatted request.
*
* @param parts: form part data
*/
public class MultiPartFormDataContent(
parts: List<PartData>
parts: List<PartData>,
val boundary: String = generateBoundary(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you tell me why do we need boundary in the constructor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @e5l I had originally made it override-able but @cy6erGn0m requested an optional constructor argument in the discussion in #1970

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other option to only having contentType in the constructor and not boundary would be a lambda that accepts a string like contentTypeFn: (String) -> ContentType but I think that's a little overkill.

override val contentType: ContentType = ContentType.MultiPart.Mixed.withParameter("boundary", boundary)
) : OutgoingContent.WriteChannelContent() {
private val boundary: String = generateBoundary()
private val BOUNDARY_BYTES = "--$boundary\r\n".toByteArray()
private val LAST_BOUNDARY_BYTES = "--$boundary--\r\n\r\n".toByteArray()

Expand Down Expand Up @@ -83,8 +83,6 @@ public class MultiPartFormDataContent(

override val contentLength: Long?

override val contentType: ContentType = ContentType.MultiPart.FormData.withParameter("boundary", boundary)

init {
var rawLength:Long? = 0
for (part in rawParts) {
Expand Down