Mirror/Crow
1
0
Fork 0
mirror of https://github.com/CrowCpp/Crow.git synced 2024-06-07 21:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix example_chat crash bug when using (req, res) handler

Browse Source
This commit is contained in:
ipknHama 2014-09-14 20:12:18 +09:00
parent 532eb71e2b
commit 301587b469
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
amalgamate/crow_all.h
View File

@ -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_;

18
include/http_connection.h
View File

@ -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_;