Fix body propagation in Response::from_error. #760

actix-http/src/error.rs

@@ -1,11 +1,13 @@
 //! Error and Result module
 use std::cell::RefCell;
+use std::io::Write;
 use std::str::Utf8Error;
 use std::string::FromUtf8Error;
 use std::{fmt, io, result};
 
 pub use actix_threadpool::BlockingError;
 use actix_utils::timeout::TimeoutError;
+use bytes::BytesMut;
 use derive_more::{Display, From};
 use futures::Canceled;
 use http::uri::InvalidUri;
@@ -17,7 +19,9 @@ use serde_urlencoded::ser::Error as FormError;
 use tokio_timer::Error as TimerError;
 
 // re-export for convinience
+use crate::body::Body;
 pub use crate::cookie::ParseError as CookieParseError;
+use crate::helpers::Writer;
 use crate::response::Response;
 
 /// A specialized [`Result`](https://doc.rust-lang.org/std/result/enum.Result.html)
@@ -57,6 +61,18 @@ pub trait ResponseError: fmt::Debug + fmt::Display {
     fn error_response(&self) -> Response {
         Response::new(StatusCode::INTERNAL_SERVER_ERROR)
     }
+
+    /// Constructs an error response
+    fn render_response(&self) -> Response {
+        let mut resp = self.error_response();
+        let mut buf = BytesMut::new();
+        let _ = write!(Writer(&mut buf), "{}", self);
+        resp.headers_mut().insert(
+            header::CONTENT_TYPE,
+            header::HeaderValue::from_static("text/plain"),
+        );
+        resp.set_body(Body::from(buf))
+    }
 }
 
 impl fmt::Display for Error {
@@ -477,7 +493,16 @@ where
 {
     fn error_response(&self) -> Response {
         match self.status {
-            InternalErrorType::Status(st) => Response::new(st),
+            InternalErrorType::Status(st) => {
+                let mut res = Response::new(st);
+                let mut buf = BytesMut::new();
+                let _ = write!(Writer(&mut buf), "{}", self);
+                res.headers_mut().insert(
+                    header::CONTENT_TYPE,
+                    header::HeaderValue::from_static("text/plain"),
+                );
+                res.set_body(Body::from(buf))
+            }
             InternalErrorType::Response(ref resp) => {
                 if let Some(resp) = resp.borrow_mut().take() {
                     resp
@@ -487,6 +512,11 @@ where
             }
         }
     }
+
+    /// Constructs an error response
+    fn render_response(&self) -> Response {
+        self.error_response()
+    }
 }
 
 /// Convert Response to a Error