Merge branch 'stable' into wildcard-end-route

httpswift · May 16, 2021 · 6739e9e · 6739e9e
2 parents b9e9dd2 + 718f82c
commit 6739e9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,7 +19,8 @@ All notable changes to this project will be documented in this file. Changes not
 # [Unreleased]
 
 ## Added
-* Add support for using `**` as a catch-all at the end of a route. ([#479](https://github.com/httpswift/swifter/pull/479)) by [@michaelenger](https://github.com/michaelenger)
+- Add support for using `**` as a catch-all at the end of a route. ([#479](https://github.com/httpswift/swifter/pull/479)) by [@michaelenger](https://github.com/michaelenger)
+- Set `Content-Type` to HttpBody and Text HttpResponse. ([#474](https://github.com/httpswift/swifter/pull/474)) by [@mtgto](https://github.com/mtgto)
 
 ## Fixed
 

diff --git a/Xcode/Sources/HttpResponse.swift b/Xcode/Sources/HttpResponse.swift
@@ -136,7 +136,8 @@ public enum HttpResponse {
  case .ok(let body):
  switch body {
  case .json: headers["Content-Type"] = "application/json"
- case .html: headers["Content-Type"] = "text/html"
+ case .html, .htmlBody: headers["Content-Type"] = "text/html"
+ case .text: headers["Content-Type"] = "text/plain"
  case .data(_, let contentType): headers["Content-Type"] = contentType
  default:break
  }