From b7649af2a2744bf1050f01a82d631a87cae695f1 Mon Sep 17 00:00:00 2001
From: Omid Rad <omidmr@gmail.com>
Date: Wed, 6 May 2020 20:29:46 +0200
Subject: [PATCH] Remove content_length since it'll be overwritten by the
 response body. FIXES #1439

---
 actix-http/src/response.rs       | 6 ------
 actix-http/tests/test_openssl.rs | 2 +-
 actix-http/tests/test_rustls.rs  | 2 +-
 actix-http/tests/test_server.rs  | 2 +-
 tests/test_server.rs             | 3 +--
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/actix-http/src/response.rs b/actix-http/src/response.rs
index 7a9b82df2..ac7f86fe7 100644
--- a/actix-http/src/response.rs
+++ b/actix-http/src/response.rs
@@ -497,12 +497,6 @@ impl ResponseBuilder {
         self
     }
 
-    /// Set content length
-    #[inline]
-    pub fn content_length(&mut self, len: u64) -> &mut Self {
-        self.header(header::CONTENT_LENGTH, len)
-    }
-
     /// Set a cookie
     ///
     /// ```rust
diff --git a/actix-http/tests/test_openssl.rs b/actix-http/tests/test_openssl.rs
index 4af3a0a47..e8aaa7fc4 100644
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@@ -275,7 +275,7 @@ async fn test_h2_head_binary() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h2(|_| {
-                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
+                ok::<_, ()>(Response::Ok().body(STR))
             })
             .openssl(ssl_acceptor())
             .map_err(|_| ())
diff --git a/actix-http/tests/test_rustls.rs b/actix-http/tests/test_rustls.rs
index 1c5583b08..fff32ac8b 100644
--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@@ -281,7 +281,7 @@ async fn test_h2_head_binary() {
     let mut srv = test_server(move || {
         HttpService::build()
             .h2(|_| {
-                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
+                ok::<_, ()>(Response::Ok().body(STR))
             })
             .rustls(ssl_acceptor())
     })
diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs
index 1ec819434..35c71e37a 100644
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@@ -490,7 +490,7 @@ async fn test_h1_head_binary() {
     let mut srv = test_server(|| {
         HttpService::build()
             .h1(|_| {
-                ok::<_, ()>(Response::Ok().content_length(STR.len() as u64).body(STR))
+                ok::<_, ()>(Response::Ok().body(STR))
             })
             .tcp()
     })
diff --git a/tests/test_server.rs b/tests/test_server.rs
index 1916b372c..8c0d3dcce 100644
--- a/tests/test_server.rs
+++ b/tests/test_server.rs
@@ -349,7 +349,7 @@ async fn test_body_br_streaming() {
 async fn test_head_binary() {
     let srv = test::start_with(test::config().h1(), || {
         App::new().service(web::resource("/").route(
-            web::head().to(move || HttpResponse::Ok().content_length(100).body(STR)),
+            web::head().to(move || HttpResponse::Ok().body(STR)),
         ))
     });
 
@@ -372,7 +372,6 @@ async fn test_no_chunking() {
         App::new().service(web::resource("/").route(web::to(move || {
             HttpResponse::Ok()
                 .no_chunking()
-                .content_length(STR.len() as u64)
                 .streaming(TestBody::new(Bytes::from_static(STR.as_ref()), 24))
         })))
     });