Fixed build error on Windows

This reverts commit 531f6ab84d.

README.md

@@ -84,6 +84,79 @@ svr.Post("/multipart", [&](const auto& req, auto& res) {
 })
 ```
 
+### Stream content with Content provider
+
+```cpp
+const uint64_t DATA_CHUNK_SIZE = 4;
+
+svr.Get("/stream", [&](const Request &req, Response &res) {
+  auto data = new std::string("abcdefg");
+
+  res.set_content_provider(
+    data->size(), // Content length
+    [data](uint64_t offset, uint64_t length, Out out) {
+      const auto &d = *data;
+      out(&d[offset], std::min(length, DATA_CHUNK_SIZE));
+    },
+    [data] { delete data; });
+});
+```
+
+### Chunked transfer encoding
+
+```cpp
+svr.Get("/chunked", [&](const Request& req, Response& res) {
+  res.set_chunked_content_provider(
+    [](uint64_t offset, Out out, Done done) {
+       out("123", 3);
+       out("345", 3);
+       out("789", 3);
+       done();
+    }
+  );
+});
+```
+
+### Default thread pool supporet
+
+Set thread count to 8:
+
+```cpp
+#define CPPHTTPLIB_THREAD_POOL_COUNT 8
+```
+
+Disable the default thread pool:
+
+```cpp
+#define CPPHTTPLIB_THREAD_POOL_COUNT 0
+```
+
+### Override the default thread pool with yours
+
+```cpp
+class YourThreadPoolTaskQueue : public TaskQueue {
+public:
+  YourThreadPoolTaskQueue(size_t n) {
+    pool_.start_with_thread_count(n);
+  }
+
+  virtual void enqueue(std::function<void()> fn) override {
+    pool_.enqueue(fn);
+  }
+
+  virtual void shutdown() override {
+    pool_.shutdown_gracefully();
+  }
+
+private:
+  YourThreadPool pool_;
+};
+
+svr.new_task_queue = [] {
+  return new YourThreadPoolTaskQueue(12);
+};
+```
+
 Client Example
 --------------
 
@@ -117,9 +190,12 @@ int main(void)
 
 ```c++
   std::string body;
-  auto res = cli.Get("/large-data", [&](const char *data, size_t len) {
-    body.append(data, len);
-  });
+
+  auto res = cli.Get("/large-data",
+    [&](const char *data, uint64_t data_length, uint64_t offset, uint64_t content_length) {
+      body.append(data, data_length);
+    });
+
   assert(res->body.empty());
 ```
 
@@ -226,12 +302,37 @@ auto res = cli.Get("/basic-auth/hello/world", {
 httplib::Client cli("httpbin.org");
 
 auto res = cli.Get("/range/32", {
-  httplib::make_range_header(1, 10) // 'Range: bytes=1-10'
+  httplib::make_range_header({{1, 10}}) // 'Range: bytes=1-10'
 });
 // res->status should be 206.
 // res->body should be "bcdefghijk".
 ```
 
+```cpp
+httplib::make_range_header({{1, 10}, {20, -1}})      // 'Range: bytes=1-10, 20-'
+httplib::make_range_header({{100, 199}, {500, 599}}) // 'Range: bytes=100-199, 500-599'
+httplib::make_range_header({{0, 0}, {-1, 1}})        // 'Range: bytes=0-0, -1'
+```
+
+### Keep-Alive connection
+
+```cpp
+cli.set_keep_alive_max_count(2); // Default is 5
+
+std::vector<Request> requests;
+Get(requests, "/get-request1");
+Get(requests, "/get-request2");
+Post(requests, "/post-request1", "text", "text/plain");
+Post(requests, "/post-request2", "text", "text/plain");
+
+std::vector<Response> responses;
+if (cli.send(requests, responses)) {
+  for (const auto& res: responses) {
+    ...
+  }
+}
+```
+
 OpenSSL Support
 ---------------
 

example/redirect.cc

@@ -15,6 +15,9 @@ using namespace httplib;
 int main(void) {
   // HTTP server
   Server http;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  SSLServer https(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
+#endif
 
   http.Get("/test", [](const Request & /*req*/, Response &res) {
     res.set_content("Test\n", "text/plain");
@@ -25,8 +28,7 @@ int main(void) {
   });
 
   // HTTPS server
-  SSLServer https(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE);
-
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   https.Get("/", [=](const Request & /*req*/, Response &res) {
     res.set_redirect("/hi");
   });
@@ -39,18 +41,24 @@ int main(void) {
     https.stop();
     http.stop();
   });
+#endif
 
   // Run servers
   auto httpThread = std::thread([&]() {
     http.listen("localhost", 8080);
   });
 
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   auto httpsThread = std::thread([&]() {
     https.listen("localhost", 8081);
   });
+#endif
 
   httpThread.join();
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   httpsThread.join();
+#endif
 
   return 0;
 }

test/gtest/gtest.h

@@ -54,6 +54,11 @@
 #include <limits>
 #include <vector>
 
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996)
+#endif
+
 // Copyright 2005, Google Inc.
 // All rights reserved.
 //
@@ -19544,4 +19549,8 @@ bool StaticAssertTypeEq() {
 
 }  // namespace testing
 
+#if defined(_MSC_VER)
+#pragma warning( pop )
+#endif
+
 #endif  // GTEST_INCLUDE_GTEST_GTEST_H_

test/test.cc

@@ -95,28 +95,100 @@ TEST(GetHeaderValueTest, RegularValueInt) {
 
 TEST(GetHeaderValueTest, Range) {
   {
-    Headers headers = {make_range_header(1)};
+    Headers headers = {make_range_header({{1, -1}})};
     auto val = detail::get_header_value(headers, "Range", 0, 0);
     EXPECT_STREQ("bytes=1-", val);
   }
 
   {
-    Headers headers = {make_range_header(1, 10)};
+    Headers headers = {make_range_header({{-1, 1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=-1", val);
+  }
+
+  {
+    Headers headers = {make_range_header({{1, 10}})};
     auto val = detail::get_header_value(headers, "Range", 0, 0);
     EXPECT_STREQ("bytes=1-10", val);
   }
 
   {
-    Headers headers = {make_range_header(1, 10, 100)};
+    Headers headers = {make_range_header({{1, 10}, {100, -1}})};
     auto val = detail::get_header_value(headers, "Range", 0, 0);
     EXPECT_STREQ("bytes=1-10, 100-", val);
   }
 
   {
-    Headers headers = {make_range_header(1, 10, 100, 200)};
+    Headers headers = {make_range_header({{1, 10}, {100, 200}})};
     auto val = detail::get_header_value(headers, "Range", 0, 0);
     EXPECT_STREQ("bytes=1-10, 100-200", val);
   }
+
+  {
+    Headers headers = {make_range_header({{0, 0}, {-1, 1}})};
+    auto val = detail::get_header_value(headers, "Range", 0, 0);
+    EXPECT_STREQ("bytes=0-0, -1", val);
+  }
+}
+
+TEST(ParseHeaderValueTest, Range) {
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(-1, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=-1", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(-1, ranges[0].first);
+    EXPECT_EQ(1u, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-10", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(1u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=10-1", ranges);
+    EXPECT_FALSE(ret);
+  }
+
+  {
+    Ranges ranges;
+    auto ret = detail::parse_range_header("bytes=1-10, 100-", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(2u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+    EXPECT_EQ(100u, ranges[1].first);
+    EXPECT_EQ(-1, ranges[1].second);
+  }
+
+  {
+    Ranges ranges;
+    auto ret =
+        detail::parse_range_header("bytes=1-10, 100-200, 300-400", ranges);
+    EXPECT_TRUE(ret);
+    EXPECT_EQ(3u, ranges.size());
+    EXPECT_EQ(1u, ranges[0].first);
+    EXPECT_EQ(10u, ranges[0].second);
+    EXPECT_EQ(100u, ranges[1].first);
+    EXPECT_EQ(200u, ranges[1].second);
+    EXPECT_EQ(300u, ranges[2].first);
+    EXPECT_EQ(400u, ranges[2].second);
+  }
 }
 
 TEST(ChunkedEncodingTest, FromHTTPWatch) {
@@ -157,7 +229,10 @@ TEST(ChunkedEncodingTest, WithContentReceiver) {
   std::string body;
   auto res =
       cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137",
-              [&](const char *data, size_t len) { body.append(data, len); });
+              [&](const char *data, size_t data_length, uint64_t, uint64_t) {
+                body.append(data, data_length);
+                return true;
+              });
   ASSERT_TRUE(res != nullptr);
 
   std::string out;
@@ -188,7 +263,7 @@ TEST(RangeTest, FromHTTPBin) {
   }
 
   {
-    httplib::Headers headers = {httplib::make_range_header(1)};
+    httplib::Headers headers = {httplib::make_range_header({{1, -1}})};
     auto res = cli.Get("/range/32", headers);
     ASSERT_TRUE(res != nullptr);
     EXPECT_EQ(res->body, "bcdefghijklmnopqrstuvwxyzabcdef");
@@ -196,12 +271,35 @@ TEST(RangeTest, FromHTTPBin) {
   }
 
   {
-    httplib::Headers headers = {httplib::make_range_header(1, 10)};
+    httplib::Headers headers = {httplib::make_range_header({{1, 10}})};
     auto res = cli.Get("/range/32", headers);
     ASSERT_TRUE(res != nullptr);
     EXPECT_EQ(res->body, "bcdefghijk");
     EXPECT_EQ(206, res->status);
   }
+
+  {
+    httplib::Headers headers = {httplib::make_range_header({{0, 31}})};
+    auto res = cli.Get("/range/32", headers);
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(res->body, "abcdefghijklmnopqrstuvwxyzabcdef");
+    EXPECT_EQ(200, res->status);
+  }
+
+  {
+    httplib::Headers headers = {httplib::make_range_header({{0, -1}})};
+    auto res = cli.Get("/range/32", headers);
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(res->body, "abcdefghijklmnopqrstuvwxyzabcdef");
+    EXPECT_EQ(200, res->status);
+  }
+
+  {
+    httplib::Headers headers = {httplib::make_range_header({{0, 32}})};
+    auto res = cli.Get("/range/32", headers);
+    ASSERT_TRUE(res != nullptr);
+    EXPECT_EQ(416, res->status);
+  }
 }
 
 TEST(ConnectionErrorTest, InvalidHost) {
@@ -264,8 +362,7 @@ TEST(CancelTest, NoCancel) {
   httplib::Client cli(host, port, sec);
 #endif
 
-  auto res =
-      cli.Get("/range/32", [](uint64_t, uint64_t) { return true; });
+  auto res = cli.Get("/range/32", [](uint64_t, uint64_t) { return true; });
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(res->body, "abcdefghijklmnopqrstuvwxyzabcdef");
   EXPECT_EQ(200, res->status);
@@ -283,8 +380,7 @@ TEST(CancelTest, WithCancelSmallPayload) {
   httplib::Client cli(host, port, sec);
 #endif
 
-  auto res =
-      cli.Get("/range/32", [](uint64_t, uint64_t) { return false; });
+  auto res = cli.Get("/range/32", [](uint64_t, uint64_t) { return false; });
   ASSERT_TRUE(res == nullptr);
 }
 
@@ -325,9 +421,9 @@ TEST(BaseAuthTest, FromHTTPWatch) {
   }
 
   {
-    auto res = cli.Get("/basic-auth/hello/world", {
-      httplib::make_basic_authentication_header("hello", "world")
-    });
+    auto res =
+        cli.Get("/basic-auth/hello/world",
+                {httplib::make_basic_authentication_header("hello", "world")});
     ASSERT_TRUE(res != nullptr);
     EXPECT_EQ(res->body,
               "{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n");
@@ -402,28 +498,54 @@ protected:
                 res.set_content(json, "appliation/json");
                 res.status = 200;
               })
-        .Get("/streamedchunked",
+        .Get("/streamed-chunked",
              [&](const Request & /*req*/, Response &res) {
-               res.content_producer = [](uint64_t offset) {
-                 if (offset < 3) return "a";
-                 if (offset < 6) return "b";
-                 return "";
-               };
+               res.set_chunked_content_provider(
+                   [](uint64_t /*offset*/, DataSink sink, Done done) {
+                     sink("123", 3);
+                     sink("456", 3);
+                     sink("789", 3);
+                     done();
+                   });
              })
         .Get("/streamed",
              [&](const Request & /*req*/, Response &res) {
-               res.set_header("Content-Length", "6");
-               res.content_producer = [](uint64_t offset) {
-                 if (offset < 3) return "a";
-                 if (offset < 6) return "b";
-                 return "";
-               };
+               res.set_content_provider(
+                   6, [](uint64_t offset, uint64_t /*length*/, DataSink sink) {
+                     sink(offset < 3 ? "a" : "b", 1);
+                   });
+             })
+        .Get("/streamed-with-range",
+             [&](const Request & /*req*/, Response &res) {
+               auto data = new std::string("abcdefg");
+               res.set_content_provider(
+                   data->size(),
+                   [data](uint64_t offset, uint64_t length, DataSink sink) {
+                     size_t DATA_CHUNK_SIZE = 4;
+                     const auto &d = *data;
+                     auto out_len = std::min(static_cast<size_t>(length), DATA_CHUNK_SIZE);
+                     sink(&d[offset], out_len);
+                   },
+                   [data] { delete data; });
+             })
+        .Get("/streamed-cancel",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content_provider(
+                   size_t(-1),
+                   [](uint64_t /*offset*/, uint64_t /*length*/, DataSink sink) {
+                     std::string data = "data_chunk";
+                     sink(data.data(), data.size());
+                   });
+             })
+        .Get("/with-range",
+             [&](const Request & /*req*/, Response &res) {
+               res.set_content("abcdefg", "text/plain");
              })
         .Post("/chunked",
               [&](const Request &req, Response & /*res*/) {
                 EXPECT_EQ(req.body, "dechunked post body");
               })
-        .Post("/largechunked",
+        .Post("/large-chunked",
               [&](const Request &req, Response & /*res*/) {
                 std::string expected(6 * 30 * 1024u, 'a');
                 EXPECT_EQ(req.body, expected);
@@ -579,7 +701,6 @@ TEST_F(ServerTest, GetMethod200) {
   EXPECT_EQ(200, res->status);
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ(1, res->get_header_value_count("Content-Type"));
-  EXPECT_EQ("close", res->get_header_value("Connection"));
   EXPECT_EQ("Hello World!", res->body);
 }
 
@@ -737,85 +858,29 @@ TEST_F(ServerTest, EmptyRequest) {
 }
 
 TEST_F(ServerTest, LongRequest) {
-  auto res =
-      cli_.Get("/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/__ok__");
+  std::string request;
+  for (size_t i = 0; i < 545; i++) {
+    request += "/TooLongRequest";
+  }
+  request += "OK";
+
+  auto res = cli_.Get(request.c_str());
 
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(404, res->status);
 }
 
 TEST_F(ServerTest, TooLongRequest) {
-  auto res =
-      cli_.Get("/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/"
-               "TooLongRequest/TooLongRequest/TooLongRequest/__ng___");
+  std::string request;
+  for (size_t i = 0; i < 545; i++) {
+    request += "/TooLongRequest";
+  }
+  request += "_NG";
+
+  auto res = cli_.Get(request.c_str());
 
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(404, res->status);
+  EXPECT_EQ(414, res->status);
 }
 
 TEST_F(ServerTest, LongHeader) {
@@ -963,11 +1028,11 @@ TEST_F(ServerTest, EndWithPercentCharacterInQuery) {
 
 TEST_F(ServerTest, MultipartFormData) {
   MultipartFormDataItems items = {
-    { "text1", "text default", "", "" },
-    { "text2", "aωb", "", "" },
-    { "file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain" },
-    { "file2", "{\n  \"world\", true\n}\n", "world.json", "application/json" },
-    { "file3", "", "", "application/octet-stream" },
+      {"text1", "text default", "", ""},
+      {"text2", "aωb", "", ""},
+      {"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
+      {"file2", "{\n  \"world\", true\n}\n", "world.json", "application/json"},
+      {"file3", "", "", "application/octet-stream"},
   };
 
   auto res = cli_.Post("/multipart", items);
@@ -1013,25 +1078,114 @@ TEST_F(ServerTest, CaseInsensitiveTransferEncoding) {
   EXPECT_EQ(200, res->status);
 }
 
+TEST_F(ServerTest, GetStreamed2) {
+  auto res = cli_.Get("/streamed", {{make_range_header({{2, 3}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(std::string("ab"), res->body);
+}
+
 TEST_F(ServerTest, GetStreamed) {
   auto res = cli_.Get("/streamed");
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(200, res->status);
   EXPECT_EQ("6", res->get_header_value("Content-Length"));
-  EXPECT_TRUE(res->body == "aaabbb");
+  EXPECT_EQ(std::string("aaabbb"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRange1) {
+  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{3, 5}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("3", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("def"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRange2) {
+  auto res = cli_.Get("/streamed-with-range", {{make_range_header({{1, -1}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("6", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("bcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetStreamedWithRangeMultipart) {
+  auto res =
+      cli_.Get("/streamed-with-range", {{make_range_header({{1, 2}, {4, 5}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("269", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(269, res->body.size());
+}
+
+TEST_F(ServerTest, GetStreamedEndless) {
+  auto res = cli_.Get("/streamed-cancel",
+                      [](const char * /*data*/, uint64_t /*data_length*/,
+                         uint64_t offset,
+                         uint64_t /*content_length*/) { return offset < 100; });
+  ASSERT_TRUE(res == nullptr);
+}
+
+TEST_F(ServerTest, GetWithRange1) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{3, 5}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("3", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("def"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange2) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{1, -1}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("6", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("bcdefg"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange3) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{0, 0}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("1", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("a"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRange4) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{-1, 2}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("2", res->get_header_value("Content-Length"));
+  EXPECT_EQ(true, res->has_header("Content-Range"));
+  EXPECT_EQ(std::string("fg"), res->body);
+}
+
+TEST_F(ServerTest, GetWithRangeMultipart) {
+  auto res = cli_.Get("/with-range", {{make_range_header({{1, 2}, {4, 5}})}});
+  ASSERT_TRUE(res != nullptr);
+  EXPECT_EQ(206, res->status);
+  EXPECT_EQ("269", res->get_header_value("Content-Length"));
+  EXPECT_EQ(false, res->has_header("Content-Range"));
+  EXPECT_EQ(269, res->body.size());
 }
 
 TEST_F(ServerTest, GetStreamedChunked) {
-  auto res = cli_.Get("/streamedchunked");
+  auto res = cli_.Get("/streamed-chunked");
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(200, res->status);
-  EXPECT_TRUE(res->body == "aaabbb");
+  EXPECT_EQ(std::string("123456789"), res->body);
 }
 
 TEST_F(ServerTest, LargeChunkedPost) {
   Request req;
   req.method = "POST";
-  req.path = "/largechunked";
+  req.path = "/large-chunked";
 
   std::string host_and_port;
   host_and_port += HOST;
@@ -1119,15 +1273,49 @@ TEST_F(ServerTest, ArrayParam) {
 }
 
 TEST_F(ServerTest, NoMultipleHeaders) {
-  Headers headers = {
-    { "Content-Length", "5" }
-  };
+  Headers headers = {{"Content-Length", "5"}};
   auto res = cli_.Post("/validate-no-multiple-headers", headers, "hello",
                        "text/plain");
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(200, res->status);
 }
 
+TEST_F(ServerTest, KeepAlive) {
+  cli_.set_keep_alive_max_count(4);
+
+  std::vector<Request> requests;
+  Get(requests, "/hi");
+  Get(requests, "/hi");
+  Get(requests, "/hi");
+  Get(requests, "/not-exist");
+  Post(requests, "/empty", "", "text/plain");
+
+  std::vector<Response> responses;
+  auto ret = cli_.send(requests, responses);
+
+  ASSERT_TRUE(ret == true);
+  ASSERT_TRUE(requests.size() == responses.size());
+
+  for (int i = 0; i < 3; i++) {
+    auto& res = responses[i];
+    EXPECT_EQ(200, res.status);
+    EXPECT_EQ("text/plain", res.get_header_value("Content-Type"));
+    EXPECT_EQ("Hello World!", res.body);
+  }
+
+  {
+    auto& res = responses[3];
+    EXPECT_EQ(404, res.status);
+  }
+
+  {
+    auto& res = responses[4];
+    EXPECT_EQ(200, res.status);
+    EXPECT_EQ("text/plain", res.get_header_value("Content-Type"));
+    EXPECT_EQ("empty", res.body);
+  }
+}
+
 #ifdef CPPHTTPLIB_ZLIB_SUPPORT
 TEST_F(ServerTest, Gzip) {
   Headers headers;
@@ -1148,9 +1336,12 @@ TEST_F(ServerTest, GzipWithContentReceiver) {
   Headers headers;
   headers.emplace("Accept-Encoding", "gzip, deflate");
   std::string body;
-  auto res = cli_.Get("/gzip", headers, [&](const char *data, size_t len) {
-    body.append(data, len);
-  });
+  auto res = cli_.Get("/gzip", headers,
+                      [&](const char *data, uint64_t data_length,
+                          uint64_t /*offset*/, uint64_t /*content_length*/) {
+                        body.append(data, data_length);
+                        return true;
+                      });
 
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ("gzip", res->get_header_value("Content-Encoding"));
@@ -1181,9 +1372,12 @@ TEST_F(ServerTest, NoGzipWithContentReceiver) {
   Headers headers;
   headers.emplace("Accept-Encoding", "gzip, deflate");
   std::string body;
-  auto res = cli_.Get("/nogzip", headers, [&](const char *data, size_t len) {
-    body.append(data, len);
-  });
+  auto res = cli_.Get("/nogzip", headers,
+                      [&](const char *data, uint64_t data_length,
+                          uint64_t /*offset*/, uint64_t /*content_length*/) {
+                        body.append(data, data_length);
+                        return true;
+                      });
 
   ASSERT_TRUE(res != nullptr);
   EXPECT_EQ(false, res->has_header("Content-Encoding"));
@@ -1443,6 +1637,7 @@ TEST(SSLClientServerTest, ClientCertPresent) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  msleep(1);
 
   httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE,
                          CLIENT_PRIVATE_KEY_FILE);
@@ -1461,6 +1656,7 @@ TEST(SSLClientServerTest, ClientCertMissing) {
   svr.Get("/test", [&](const Request &, Response &) { ASSERT_TRUE(false); });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  msleep(1);
 
   httplib::SSLClient cli(HOST, PORT, 30);
   auto res = cli.Get("/test");
@@ -1481,6 +1677,7 @@ TEST(SSLClientServerTest, TrustDirOptional) {
   });
 
   thread t = thread([&]() { ASSERT_TRUE(svr.listen(HOST, PORT)); });
+  msleep(1);
 
   httplib::SSLClient cli(HOST, PORT, 30, CLIENT_CERT_FILE,
                          CLIENT_PRIVATE_KEY_FILE);