Skip to content

NamedFile: send Content-Length on 206 Partial Content #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fafhrd91 merged 1 commit into from
Oct 25, 2026
Merged

NamedFile: send Content-Length on 206 Partial Content #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 64 additions & 71 deletions ntex-files/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,93 +971,86 @@ mod tests {

#[ntex::test]
async fn test_named_file_content_length_headers() {
let srv = test::init_service(
App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
)
.await;
let srv = test::server(async |_| App::new().service(Files::new("/", ".")));
let data = Bytes::from(fs::read("tests/test.binary").unwrap());

// Valid range header
let request = TestRequest::get()
.uri("/t%65st/tests/test.binary")
let response = srv
.get("/tests/test.binary")
.header(http::header::RANGE, "bytes=10-20")
.to_request();
let _response = test::call_service(&srv, request).await;

// let contentlength = _response
// .headers()
// .get(header::CONTENT_LENGTH)
// .unwrap()
// .to_str()
// .unwrap();
// assert_eq!(contentlength, "11");
.send()
.await
.unwrap();
assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT);
let content_length = response.headers().get(http::header::CONTENT_LENGTH);
assert_eq!(content_length.map(|v| v.to_str().unwrap()), Some("11"));
let transfer_encoding = response.headers().get(http::header::TRANSFER_ENCODING);
assert!(transfer_encoding.is_none());
let bytes = response.body().await.unwrap();
assert_eq!(bytes, data.slice(10..21));

// Valid range header, starting from 0
let response = srv
.get("/tests/test.binary")
.header(http::header::RANGE, "bytes=0-20")
.send()
.await
.unwrap();
assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT);
let content_length = response.headers().get(http::header::CONTENT_LENGTH);
assert_eq!(content_length.map(|v| v.to_str().unwrap()), Some("21"));
let transfer_encoding = response.headers().get(http::header::TRANSFER_ENCODING);
assert!(transfer_encoding.is_none());
let bytes = response.body().await.unwrap();
assert_eq!(bytes, data.slice(0..21));

// Invalid range header
let request = TestRequest::get()
.uri("/t%65st/tests/test.binary")
let response = srv
.get("/tests/test.binary")
.header(http::header::RANGE, "bytes=10-8")
.to_request();
let response = test::call_service(&srv, request).await;
.send()
.await
.unwrap();
assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE);

// Without range header
let request = TestRequest::get()
.uri("/t%65st/tests/test.binary")
// .no_default_headers()
.to_request();
let _response = test::call_service(&srv, request).await;

// let contentlength = response
// .headers()
// .get(header::CONTENT_LENGTH)
// .unwrap()
// .to_str()
// .unwrap();
// assert_eq!(contentlength, "100");

// chunked
let request = TestRequest::get()
.uri("/t%65st/tests/test.binary")
.to_request();
let response = test::call_service(&srv, request).await;

// with enabled compression
// {
// let te = response
// .headers()
// .get(header::TRANSFER_ENCODING)
// .unwrap()
// .to_str()
// .unwrap();
// assert_eq!(te, "chunked");
// }

let bytes = test::read_body(response).await;
let data = Bytes::from(fs::read("tests/test.binary").unwrap());
let response = srv.get("/tests/test.binary").send().await.unwrap();
assert_eq!(response.status(), StatusCode::OK);
let content_length = response.headers().get(http::header::CONTENT_LENGTH);
assert_eq!(content_length.map(|v| v.to_str().unwrap()), Some("100"));
let transfer_encoding = response.headers().get(http::header::TRANSFER_ENCODING);
assert!(transfer_encoding.is_none());
let bytes = response.body().await.unwrap();
assert_eq!(bytes, data);
}

#[ntex::test]
async fn test_head_content_length_headers() {
let srv = test::init_service(
App::new().service(Files::new("test", ".").index_file("tests/test.binary")),
)
.await;
let srv = test::server(async |_| App::new().service(Files::new("/", ".")));

// Without range header
let response = srv.head("/tests/test.binary").send().await.unwrap();
assert_eq!(response.status(), StatusCode::OK);
let content_length = response.headers().get(http::header::CONTENT_LENGTH);
assert_eq!(content_length.map(|v| v.to_str().unwrap()), Some("100"));

// Valid range header
let request = TestRequest::default()
.method(Method::HEAD)
.uri("/t%65st/tests/test.binary")
.to_request();
let _response = test::call_service(&srv, request).await;

// TODO: fix check
// let contentlength = response
// .headers()
// .get(header::CONTENT_LENGTH)
// .unwrap()
// .to_str()
// .unwrap();
// assert_eq!(contentlength, "100");
let response = srv
.head("/tests/test.binary")
.header(http::header::RANGE, "bytes=10-20")
.send()
.await
.unwrap();
assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT);
let content_range = response.headers().get(http::header::CONTENT_RANGE);
assert_eq!(
content_range.map(|v| v.to_str().unwrap()),
Some("bytes 10-20/100")
);
let content_length = response.headers().get(http::header::CONTENT_LENGTH);
assert_eq!(content_length.map(|v| v.to_str().unwrap()), Some("11"));
let transfer_encoding = response.headers().get(http::header::TRANSFER_ENCODING);
assert!(transfer_encoding.is_none());
}

#[ntex::test]
Expand Down
17 changes: 8 additions & 9 deletions ntex-files/src/named.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,16 +429,15 @@ impl NamedFile {
counter: 0,
};
if offset != 0 || length != self.md.len() {
resp.status(StatusCode::PARTIAL_CONTENT).streaming(reader)
} else {
resp.body(SizedStream::new(
length,
reader.map_err(|e| {
let e: Rc<dyn Error> = Rc::new(e);
e
}),
))
resp.status(StatusCode::PARTIAL_CONTENT);
}
resp.body(SizedStream::new(
length,
reader.map_err(|e| {
let e: Rc<dyn Error> = Rc::new(e);
e
}),
))
}
}

Expand Down
Loading