From d566d02a4f8696646340734c8536bade84c05b94 Mon Sep 17 00:00:00 2001 From: Pantonshire Date: Tue, 17 May 2022 20:03:07 +0100 Subject: [PATCH] Fix issue where HTML responses had two different content-type headers --- blog_server/src/services/response.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/blog_server/src/services/response.rs b/blog_server/src/services/response.rs index af70e08..6fe4ca1 100644 --- a/blog_server/src/services/response.rs +++ b/blog_server/src/services/response.rs @@ -1,8 +1,12 @@ -use std::borrow::Cow; -use std::fmt::{self, Write}; - -use axum::response::{IntoResponse, Response}; -use axum::http::{self, StatusCode}; +use std::{ + borrow::Cow, + fmt::{self, Write}, +}; + +use axum::{ + http::StatusCode, + response::{IntoResponse, Html, Response}, +}; use maud::{html, Markup, Render, Escaper, DOCTYPE}; #[derive(Debug)] @@ -140,13 +144,8 @@ impl IntoResponse for HtmlResponse { } }; - let mut response = (self.status, html_doc.into_string()) - .into_response(); - - response.headers_mut() - .append("Content-Type", http::HeaderValue::from_static("text/html; charset=utf-8")); - - response + (self.status, Html(html_doc.into_string())) + .into_response() } }