From ec87b04aff6bde589e09f55610fb647b160fa81f Mon Sep 17 00:00:00 2001
From: yhirose <yuji.hirose.bug@gmail.com>
Date: Sat, 29 Jul 2023 00:53:57 -0400
Subject: [PATCH] Fix #1619

---
 httplib.h    |  7 +++----
 test/test.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/httplib.h b/httplib.h
index c69421e..9a26484 100644
--- a/httplib.h
+++ b/httplib.h
@@ -4267,9 +4267,9 @@ public:
           buf_erase(crlf_.size());
           state_ = 1;
         } else {
-          if (dash_crlf_.size() > buf_size()) { return true; }
-          if (buf_start_with(dash_crlf_)) {
-            buf_erase(dash_crlf_.size());
+          if (dash_.size() > buf_size()) { return true; }
+          if (buf_start_with(dash_)) {
+            buf_erase(dash_.size());
             is_valid_ = true;
             buf_erase(buf_size()); // Remove epilogue
           } else {
@@ -4302,7 +4302,6 @@ private:
 
   const std::string dash_ = "--";
   const std::string crlf_ = "\r\n";
-  const std::string dash_crlf_ = "--\r\n";
   std::string boundary_;
   std::string dash_boundary_crlf_;
   std::string crlf_dash_boundary_;
diff --git a/test/test.cc b/test/test.cc
index e56e35a..5d85611 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -6106,6 +6106,8 @@ TEST(MultipartFormDataTest, PutInvalidBoundaryChars) {
 }
 
 TEST(MultipartFormDataTest, AlternateFilename) {
+  auto handled = false;
+
   Server svr;
   svr.Post("/test", [&](const Request &req, Response &res) {
     ASSERT_EQ(3u, req.files.size());
@@ -6130,6 +6132,8 @@ TEST(MultipartFormDataTest, AlternateFilename) {
     ASSERT_EQ("text default", it->second.content);
 
     res.set_content("ok", "text/plain");
+
+    handled = true;
   });
 
   thread t = thread([&] { svr.listen(HOST, PORT); });
@@ -6137,6 +6141,7 @@ TEST(MultipartFormDataTest, AlternateFilename) {
     svr.stop();
     t.join();
     ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
   });
 
   svr.wait_until_ready();
@@ -6168,6 +6173,52 @@ TEST(MultipartFormDataTest, AlternateFilename) {
   ASSERT_TRUE(send_request(1, req));
 }
 
+TEST(MultipartFormDataTest, CloseDelimiterWithoutCRLF) {
+  auto handled = false;
+
+  Server svr;
+  svr.Post("/test", [&](const Request &req, Response &) {
+    ASSERT_EQ(2u, req.files.size());
+
+    auto it = req.files.begin();
+    ASSERT_EQ("text1", it->second.name);
+    ASSERT_EQ("text1", it->second.content);
+
+    ++it;
+    ASSERT_EQ("text2", it->second.name);
+    ASSERT_EQ("text2", it->second.content);
+
+    handled = true;
+  });
+
+  thread t = thread([&] { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    t.join();
+    ASSERT_FALSE(svr.is_running());
+    ASSERT_TRUE(handled);
+  });
+
+  svr.wait_until_ready();
+
+  auto req = "POST /test HTTP/1.1\r\n"
+             "Content-Type: multipart/form-data;boundary=--------\r\n"
+             "Content-Length: 146\r\n"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text1\"\r\n"
+             "\r\n"
+             "text1"
+             "\r\n----------\r\n"
+             "Content-Disposition: form-data; name=\"text2\"\r\n"
+             "\r\n"
+             "text2"
+             "\r\n------------";
+
+  std::string resonse;
+  ASSERT_TRUE(send_request(1, req, &resonse));
+  ASSERT_EQ("200", resonse.substr(9, 3));
+}
+
 #endif
 
 #ifndef _WIN32