Skip to content

[Fix] Data Concatenation Error in Swift 6.3 #22

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

Merged
FelixHerrmann merged 1 commit into from
Mar 28, 2026
Merged

[Fix] Data Concatenation Error in Swift 6.3 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/MultipartFormData/MultipartFormData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ extension MultipartFormData {
/// This combines all the data from the subparts into one big data object.
public var httpBody: Data {
let bodyData: Data = body
.map { ._dash + boundary._asciiData + ._crlf + $0.data + ._crlf }
.map { Data._dash + boundary._asciiData + Data._crlf + $0.data + Data._crlf }
.reduce(Data(), +)
return bodyData + ._dash + boundary._asciiData + ._dash + ._crlf
return bodyData + Data._dash + boundary._asciiData + Data._dash + Data._crlf
}
}

Expand Down Expand Up @@ -162,7 +162,7 @@ extension MultipartFormData {

extension MultipartFormData: CustomDebugStringConvertible {
public var debugDescription: String {
let bytes: Data = contentType.data + ._crlf + ._crlf + httpBody
let bytes: Data = contentType.data + Data._crlf + Data._crlf + httpBody
return String(bytes: bytes, encoding: .utf8) ?? ""
}
}
4 changes: 2 additions & 2 deletions Sources/MultipartFormData/Subpart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ extension Subpart: CustomDebugStringConvertible {
extension Subpart {
/// The data representation of a subpart.
public var data: Data {
let contentTypeData: Data = contentType.map { $0.data + ._crlf } ?? Data()
return contentDisposition.data + ._crlf + contentTypeData + ._crlf + body
let contentTypeData: Data = contentType.map { $0.data + Data._crlf } ?? Data()
return contentDisposition.data + Data._crlf + contentTypeData + Data._crlf + body
}
}