From 01b90829bc8f353c90be01f0601cc1e68239dee8 Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Sat, 29 Jul 2023 23:01:47 -0400
Subject: [PATCH] Removed unnecessary CRLF at the end of multipart ranges data
---
httplib.h | 2 +-
test/test.cc | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/httplib.h b/httplib.h
index 9cb49cc..636dafe 100644
--- a/httplib.h
+++ b/httplib.h
@@ -4530,7 +4530,7 @@ bool process_multipart_ranges_data(const Request &req, Response &res,
ctoken("--");
stoken(boundary);
- ctoken("--\r\n");
+ ctoken("--");
return true;
}
diff --git a/test/test.cc b/test/test.cc
index 5d85611..893080d 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -2886,9 +2886,9 @@ TEST_F(ServerTest, GetStreamedWithRangeMultipart) {
cli_.Get("/streamed-with-range", {{make_range_header({{1, 2}, {4, 5}})}});
ASSERT_TRUE(res);
EXPECT_EQ(206, res->status);
- EXPECT_EQ("269", res->get_header_value("Content-Length"));
+ EXPECT_EQ("267", res->get_header_value("Content-Length"));
EXPECT_EQ(false, res->has_header("Content-Range"));
- EXPECT_EQ(269U, res->body.size());
+ EXPECT_EQ(267U, res->body.size());
}
TEST_F(ServerTest, GetStreamedEndless) {
@@ -2978,9 +2978,9 @@ TEST_F(ServerTest, GetWithRangeMultipart) {
auto res = cli_.Get("/with-range", {{make_range_header({{1, 2}, {4, 5}})}});
ASSERT_TRUE(res);
EXPECT_EQ(206, res->status);
- EXPECT_EQ("269", res->get_header_value("Content-Length"));
+ EXPECT_EQ("267", res->get_header_value("Content-Length"));
EXPECT_EQ(false, res->has_header("Content-Range"));
- EXPECT_EQ(269U, res->body.size());
+ EXPECT_EQ(267U, res->body.size());
}
TEST_F(ServerTest, GetWithRangeMultipartOffsetGreaterThanContent) {