Update coro_http_client.hpp

helintongh · Jun 24, 2024 · 6179757 · 6179757
1 parent ad4bee5
commit 6179757
Showing 1 changed file with 17 additions and 23 deletions.
diff --git a/include/cinatra/coro_http_client.hpp b/include/cinatra/coro_http_client.hpp
@@ -1568,41 +1568,35 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
           data.resp_body = unziped_str;
         else
           data.resp_body = reply;
-
-        head_buf_.consume(content_len);
-        data.eof = (head_buf_.size() == 0);
-        co_return;
       }
-
-      if (encoding_type_ == content_encoding::deflate) {
+      else if (encoding_type_ == content_encoding::deflate) {
         std::string inflate_str;
         bool r = gzip_codec::inflate(reply, inflate_str);
         if (r)
           data.resp_body = inflate_str;
         else
           data.resp_body = reply;
-
-        head_buf_.consume(content_len);
-        data.eof = (head_buf_.size() == 0);
-        co_return;
       }
 #endif
-
+#if defined(CINATRA_ENABLE_BROTLI) && defined(CINATRA_ENABLE_GZIP)
+      else if (encoding_type_ == content_encoding::br)
+#endif
+#if defined(CINATRA_ENABLE_BROTLI) && !defined(CINATRA_ENABLE_GZIP)
+        if (encoding_type_ == content_encoding::br)
+#endif
 #ifdef CINATRA_ENABLE_BROTLI
-      if (encoding_type_ == content_encoding::br) {
-        bool r = br_codec::brotli_decompress(reply, unbr_str_);
-        if (r)
-          data.resp_body = unbr_str_;
+        {
+          bool r = br_codec::brotli_decompress(reply, unbr_str_);
+          if (r)
+            data.resp_body = unbr_str_;
+          else
+            data.resp_body = reply;
+        }
+#endif
+#if defined(CINATRA_ENABLE_BROTLI) || defined(CINATRA_ENABLE_GZIP)
         else
-          data.resp_body = reply;
-
-        head_buf_.consume(content_len);
-        data.eof = (head_buf_.size() == 0);
-        co_return;
-      }
 #endif
-
-      data.resp_body = reply;
+          data.resp_body = reply;
 
       head_buf_.consume(content_len);
     }