From bf48798bcec35580c408d190b50cc2e42526f1a2 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 13 Jun 2019 15:27:21 +0600
Subject: [PATCH] Content-Length is 0 for NamedFile HEAD request #914

---
 actix-files/CHANGES.md   |  6 ++++--
 actix-files/src/lib.rs   | 23 +++++++++++++++++++++++
 actix-files/src/named.rs | 26 +++++++++++---------------
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 862a59442..e79d80967 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -1,8 +1,10 @@
 # Changes
 
-## [0.1.2] - 2019-06-06
+## [0.1.2] - 2019-06-13
 
-* Fix ring dependency from actix-web default features for #741.
+* Content-Length is 0 for NamedFile HEAD request #914
+
+* Fix ring dependency from actix-web default features for #741
 
 ## [0.1.1] - 2019-06-01
 
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
index 301d9d81d..9f526f3f0 100644
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -926,6 +926,29 @@ mod tests {
         assert_eq!(bytes.freeze(), data);
     }
 
+    #[test]
+    fn test_head_content_length_headers() {
+        let mut srv = test::init_service(
+            App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
+        );
+
+        // Valid range header
+        let request = TestRequest::default()
+            .method(Method::HEAD)
+            .uri("/t%65st/tests/test.binary")
+            .to_request();
+        let response = test::call_service(&mut srv, request);
+
+        let contentlength = response
+            .headers()
+            .get(header::CONTENT_LENGTH)
+            .unwrap()
+            .to_str()
+            .unwrap();
+
+        assert_eq!(contentlength, "100");
+    }
+
     #[test]
     fn test_static_files_with_spaces() {
         let mut srv = test::init_service(
diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs
index 29e9eee41..3ece7c212 100644
--- a/actix-files/src/named.rs
+++ b/actix-files/src/named.rs
@@ -422,20 +422,16 @@ impl Responder for NamedFile {
             return Ok(resp.status(StatusCode::NOT_MODIFIED).finish());
         }
 
-        if *req.method() == Method::HEAD {
-            Ok(resp.finish())
-        } else {
-            let reader = ChunkedReadFile {
-                offset,
-                size: length,
-                file: Some(self.file),
-                fut: None,
-                counter: 0,
-            };
-            if offset != 0 || length != self.md.len() {
-                return Ok(resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader));
-            };
-            Ok(resp.body(SizedStream::new(length, reader)))
-        }
+        let reader = ChunkedReadFile {
+            offset,
+            size: length,
+            file: Some(self.file),
+            fut: None,
+            counter: 0,
+        };
+        if offset != 0 || length != self.md.len() {
+            return Ok(resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader));
+        };
+        Ok(resp.body(SizedStream::new(length, reader)))
     }
 }