Skip to content

Adds Content-Type to Data HttpResponse #450

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
Vkt0r merged 1 commit into from
Jul 10, 2020
Merged

Adds Content-Type to Data HttpResponse #450

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file. Changes not

- Add the `trailing_whitespace` rule in Swiftlint and autocorrect all the source files. ([#421](https://github.com/httpswift/swifter/pull/421)) by [@Vkt0r](https://github.com/Vkt0r)
- Update the project for Xcode 11.1. ([#438](https://github.com/httpswift/swifter/pull/438)) by [@Vkt0r](https://github.com/Vkt0r)
- Add optional 'Content-Type' to Data HttpResponse. ([#450](https://github.com/httpswift/swifter/pull/450)) by [@SoftwareEngineerChris](https://github.com/SoftwareEngineerChris)

## Changed

Expand Down
5 changes: 3 additions & 2 deletions XCode/Sources/HttpResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public enum HttpResponseBody {
case html(String)
case htmlBody(String)
case text(String)
case data(Data)
case data(Data, contentType: String? = nil)
case custom(Any, (Any) throws -> String)

func content() -> (Int, ((HttpResponseBodyWriter) throws -> Void)?) {
Expand Down Expand Up @@ -56,7 +56,7 @@ public enum HttpResponseBody {
return (data.count, {
try $0.write(data)
})
case .data(let data):
case .data(let data, _):
return (data.count, {
try $0.write(data)
})
Expand Down Expand Up @@ -132,6 +132,7 @@ public enum HttpResponse {
switch body {
case .json: headers["Content-Type"] = "application/json"
case .html: headers["Content-Type"] = "text/html"
case .data(_, let contentType): headers["Content-Type"] = contentType
default:break
}
case .movedPermanently(let location):
Expand Down