Added Get2

Author: yhirose

httplib.h

@@ -717,6 +717,13 @@ class Result {
   Error err_;
 };
 
+struct ClientOptions {
+  Headers headers;
+  Progress progress;
+  ResponseHandler response_handler;
+  ContentReceiver content_receiver;
+};
+
 class ClientImpl {
 public:
   explicit ClientImpl(const std::string &host);
@@ -731,6 +738,8 @@ class ClientImpl {
 
   virtual bool is_valid() const;
 
+  Result Get2(std::string_view path, ClientOptions options);
+
   Result Get(const char *path);
   Result Get(const char *path, const Headers &headers);
   Result Get(const char *path, Progress progress);
@@ -966,6 +975,8 @@ class Client {
 
   bool is_valid() const;
 
+  Result Get2(std::string_view path, ClientOptions options);
+
   Result Get(const char *path);
   Result Get(const char *path, const Headers &headers);
   Result Get(const char *path, Progress progress);
@@ -5106,6 +5117,13 @@ ClientImpl::process_socket(Socket &socket,
 
 inline bool ClientImpl::is_ssl() const { return false; }
 
+inline Result ClientImpl::Get2(std::string_view path, ClientOptions options) {
+  auto path2 = std::string(path);
+  return Get(path2.c_str(), std::move(options.headers),
+             std::move(options.response_handler),
+             std::move(options.content_receiver), std::move(options.progress));
+}
+
 inline Result ClientImpl::Get(const char *path) {
   return Get(path, Headers(), Progress());
 }
@@ -5844,7 +5862,7 @@ inline void SSLClient::set_ca_cert_path(const char *ca_cert_file_path,
 
 inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) {
   if (ca_cert_store) {
-    if(ctx_) {
+    if (ctx_) {
       if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) {
         // Free memory allocated for old cert and use new store `ca_cert_store`
         SSL_CTX_set_cert_store(ctx_, ca_cert_store);
@@ -6205,6 +6223,10 @@ inline bool Client::is_valid() const {
   return cli_ != nullptr && cli_->is_valid();
 }
 
+inline Result Client::Get2(std::string_view path, ClientOptions options) {
+  return cli_->Get2(path, options);
+}
+
 inline Result Client::Get(const char *path) { return cli_->Get(path); }
 inline Result Client::Get(const char *path, const Headers &headers) {
   return cli_->Get(path, headers);

test/Makefile

@@ -1,6 +1,6 @@
 
 #CXX = clang++
-CXXFLAGS = -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits -Wconversion -fsanitize=address
+CXXFLAGS = -ggdb -O0 -std=c++17 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits -Wconversion -fsanitize=address
 
 OPENSSL_DIR = /usr/local/opt/[email protected]
 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto

test/test.cc

@@ -3443,4 +3443,57 @@ TEST(HttpsToHttpRedirectTest2, SimpleInterface) {
   EXPECT_EQ(200, res->status);
 }
 #endif
+
+/**
+ * C++17 Interface Examples
+ */
+
+TEST(ChunkedEncodingTest, Cpp17_WithResponseHandlerAndContentReceiver) {
+  auto host = "www.httpwatch.com";
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  auto port = 443;
+  SSLClient cli(host, port);
+#else
+  auto port = 80;
+  Client cli(host, port);
+#endif
+  cli.set_connection_timeout(2);
+
+  std::string path =
+      "/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137";
+
+  std::string body;
+  auto res = cli.Get2(path, {.response_handler =
+                                 [&](const Response &response) {
+                                   EXPECT_EQ(200, response.status);
+                                   return true;
+                                 },
+                             .content_receiver =
+                                 [&](const char *data, size_t data_length) {
+                                   body.append(data, data_length);
+                                   return true;
+                                 }});
+  ASSERT_TRUE(res);
+
+  std::string out;
+  detail::read_file("./image.jpg", out);
+
+  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(out, body);
+}
+
+TEST(DecodeWithChunkedEncoding, Cpp17_BrotliEncoding) {
+  Client cli("https://cdnjs.cloudflare.com");
+
+  const char *path = "/ajax/libs/jquery/3.5.1/jquery.js";
+
+  auto res = cli.Get2(path, {.headers = {{"Accept-Encoding", "brotli"}}});
+
+  ASSERT_TRUE(res);
+  EXPECT_EQ(200, res->status);
+  EXPECT_EQ(287630, res->body.size());
+  EXPECT_EQ("application/javascript; charset=utf-8",
+            res->get_header_value("Content-Type"));
+}
 #endif