diff options
-rw-r--r-- | amalgamate/crow_all.h | 19 | ||||
-rw-r--r-- | include/http_connection.h | 18 |
2 files changed, 33 insertions, 4 deletions
diff --git a/amalgamate/crow_all.h b/amalgamate/crow_all.h index 3381670..4e0fc47 100644 --- a/amalgamate/crow_all.h +++ b/amalgamate/crow_all.h @@ -4699,6 +4699,7 @@ namespace crow +#pragma once // settings for crow // TODO - replace with runtime config. libucl? @@ -6807,7 +6808,6 @@ namespace crow ctx_ = detail::context<Middlewares...>(); req.middleware_context = (void*)&ctx_; detail::middleware_call_helper<0, decltype(ctx_), decltype(middlewares_), Middlewares...>(middlewares_, req, res, ctx_); - CROW_LOG_DEBUG << "ALATDA " << req.url; if (!res.completed_) { @@ -6832,6 +6832,8 @@ namespace crow if (need_to_call_after_handlers_) { + need_to_call_after_handlers_ = false; + // call all after_handler of middlewares detail::after_handlers_call_helper< ((int)sizeof...(Middlewares)-1), @@ -6941,6 +6943,13 @@ namespace crow do_write(); res.clear(); + + if (need_to_start_read_after_complete_) + { + need_to_start_read_after_complete_ = false; + start_deadline(); + do_read(); + } } private: @@ -6984,11 +6993,16 @@ namespace crow CROW_LOG_DEBUG << this << " from read(1)"; check_destroy(); } - else + else if (!need_to_call_after_handlers_) { start_deadline(); do_read(); } + else + { + // res will be completed later by user + need_to_start_read_after_complete_ = true; + } }); } @@ -7073,6 +7087,7 @@ namespace crow bool is_reading{}; bool is_writing{}; bool need_to_call_after_handlers_; + bool need_to_start_read_after_complete_{}; std::tuple<Middlewares...>& middlewares_; detail::context<Middlewares...> ctx_; diff --git a/include/http_connection.h b/include/http_connection.h index 877eb21..31808e4 100644 --- a/include/http_connection.h +++ b/include/http_connection.h @@ -199,7 +199,6 @@ namespace crow ctx_ = detail::context<Middlewares...>(); req.middleware_context = (void*)&ctx_; detail::middleware_call_helper<0, decltype(ctx_), decltype(middlewares_), Middlewares...>(middlewares_, req, res, ctx_); - CROW_LOG_DEBUG << "ALATDA " << req.url; if (!res.completed_) { @@ -224,6 +223,8 @@ namespace crow if (need_to_call_after_handlers_) { + need_to_call_after_handlers_ = false; + // call all after_handler of middlewares detail::after_handlers_call_helper< ((int)sizeof...(Middlewares)-1), @@ -333,6 +334,13 @@ namespace crow do_write(); res.clear(); + + if (need_to_start_read_after_complete_) + { + need_to_start_read_after_complete_ = false; + start_deadline(); + do_read(); + } } private: @@ -376,11 +384,16 @@ namespace crow CROW_LOG_DEBUG << this << " from read(1)"; check_destroy(); } - else + else if (!need_to_call_after_handlers_) { start_deadline(); do_read(); } + else + { + // res will be completed later by user + need_to_start_read_after_complete_ = true; + } }); } @@ -465,6 +478,7 @@ namespace crow bool is_reading{}; bool is_writing{}; bool need_to_call_after_handlers_; + bool need_to_start_read_after_complete_{}; std::tuple<Middlewares...>& middlewares_; detail::context<Middlewares...> ctx_; |