Merge branch 'master' into auth_tutorial

CrowCpp · Dec 4, 2021 · faa81ec · faa81ec
2 parents b64fc0e + e07b966
commit faa81ec
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 83 deletions.
diff --git a/include/crow/http_connection.h b/include/crow/http_connection.h
@@ -524,7 +524,18 @@ namespace crow
         {
             is_writing = true;
             boost::asio::write(adaptor_.socket(), buffers_);
-            res.do_stream_file(adaptor_);
+
+            if (res.file_info.statResult == 0)
+            {
+                std::ifstream is(res.file_info.path.c_str(), std::ios::in | std::ios::binary);
+                char buf[16384];
+                while (is.read(buf, sizeof(buf)).gcount() > 0)
+                {
+                    std::vector<asio::const_buffer> buffers;
+                    buffers.push_back(boost::asio::buffer(buf));
+                    do_write_sync(buffers);
+                }
+            }
 
             res.end();
             res.clear();
@@ -550,8 +561,30 @@ namespace crow
             else
             {
                 is_writing = true;
-                boost::asio::write(adaptor_.socket(), buffers_);
-                res.do_stream_body(adaptor_);
+                boost::asio::write(adaptor_.socket(), buffers_); // Write the response start / headers
+                if (res.body.length() > 0)
+                {
+                    std::string buf;
+                    std::vector<asio::const_buffer> buffers;
+
+                    while (res.body.length() > 16384)
+                    {
+                        //buf.reserve(16385);
+                        buf = res.body.substr(0, 16384);
+                        res.body = res.body.substr(16384);
+                        buffers.clear();
+                        buffers.push_back(boost::asio::buffer(buf));
+                        do_write_sync(buffers);
+                    }
+                    // Collect whatever is left (less than 16KB) and send it down the socket
+                    // buf.reserve(is.length());
+                    buf = res.body;
+                    res.body.clear();
+
+                    buffers.clear();
+                    buffers.push_back(boost::asio::buffer(buf));
+                    do_write_sync(buffers);
+                }
 
                 res.end();
                 res.clear();
@@ -635,6 +668,31 @@ namespace crow
               });
         }
 
+        inline void do_write_sync(std::vector<asio::const_buffer>& buffers)
+        {
+
+            boost::asio::write(adaptor_.socket(), buffers, [&](std::error_code ec, std::size_t) {
+                if (!ec)
+                {
+                    if (close_connection_)
+                    {
+                        adaptor_.shutdown_write();
+                        adaptor_.close();
+                        CROW_LOG_DEBUG << this << " from write (sync)(1)";
+                        check_destroy();
+                    }
+                    return false;
+                }
+                else
+                {
+                    CROW_LOG_ERROR << ec << " - happened while sending buffers";
+                    CROW_LOG_DEBUG << this << " from write (sync)(2)";
+                    check_destroy();
+                    return true;
+                }
+            });
+        }
+
         void check_destroy()
         {
             CROW_LOG_DEBUG << this << " is_reading " << is_reading << " is_writing " << is_writing;

diff --git a/include/crow/http_response.h b/include/crow/http_response.h
@@ -53,7 +53,6 @@ namespace crow
             return crow::get_header_value(headers, key);
         }
 
-        // TODO find a better way to format this so that stuff aren't moved down a line
         // clang-format off
         response() {}
         explicit response(int code) : code(code) {}
@@ -247,89 +246,10 @@ namespace crow
             }
         }
 
-        /// Stream a static file.
-        template<typename Adaptor>
-        void do_stream_file(Adaptor& adaptor)
-        {
-            if (file_info.statResult == 0)
-            {
-                std::ifstream is(file_info.path.c_str(), std::ios::in | std::ios::binary);
-                write_streamed(is, adaptor);
-            }
-        }
-
-        /// Stream the response body (send the body in chunks).
-        template<typename Adaptor>
-        void do_stream_body(Adaptor& adaptor)
-        {
-            if (body.length() > 0)
-            {
-                write_streamed_string(body, adaptor);
-            }
-        }
-
     private:
         bool completed_{};
         std::function<void()> complete_request_handler_;
         std::function<bool()> is_alive_helper_;
         static_file_info file_info;
-
-        template<typename Stream, typename Adaptor>
-        void write_streamed(Stream& is, Adaptor& adaptor)
-        {
-            char buf[16384];
-            while (is.read(buf, sizeof(buf)).gcount() > 0)
-            {
-                std::vector<asio::const_buffer> buffers;
-                buffers.push_back(boost::asio::buffer(buf));
-                write_buffer_list(buffers, adaptor);
-            }
-        }
-
-        // THIS METHOD DOES MODIFY THE BODY, AS IN IT EMPTIES IT
-        template<typename Adaptor>
-        void write_streamed_string(std::string& is, Adaptor& adaptor)
-        {
-            std::string buf;
-            std::vector<asio::const_buffer> buffers;
-
-            while (is.length() > 16384)
-            {
-                //buf.reserve(16385);
-                buf = is.substr(0, 16384);
-                is = is.substr(16384);
-                push_and_write(buffers, buf, adaptor);
-            }
-            // Collect whatever is left (less than 16KB) and send it down the socket
-            // buf.reserve(is.length());
-            buf = is;
-            is.clear();
-            push_and_write(buffers, buf, adaptor);
-        }
-
-        template<typename Adaptor>
-        inline void push_and_write(std::vector<asio::const_buffer>& buffers, std::string& buf, Adaptor& adaptor)
-        {
-            buffers.clear();
-            buffers.push_back(boost::asio::buffer(buf));
-            write_buffer_list(buffers, adaptor);
-        }
-
-        template<typename Adaptor>
-        inline void write_buffer_list(std::vector<asio::const_buffer>& buffers, Adaptor& adaptor)
-        {
-            boost::asio::write(adaptor.socket(), buffers, [this](std::error_code ec, std::size_t) {
-                if (!ec)
-                {
-                    return false;
-                }
-                else
-                {
-                    CROW_LOG_ERROR << ec << " - happened while sending buffers";
-                    this->end();
-                    return true;
-                }
-            });
-        }
     };
 } // namespace crow