Mirror
/
Crow
mirror of https://github.com/CrowCpp/Crow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update http_connection.h

This commit is contained in:
bruvey 2024-02-12 11:08:44 +01:00 committed by gittiver
parent d3bd942223
commit c47540bb8c
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
include/crow/http_connection.h
View File

@ -123,71 +123,72 @@ namespace crow
void handle() void handle()
{ {
// TODO(EDev): cancel_deadline_timer should be looked into, it might be a good idea to add it to handle_url() and then restart the timer once everything passes
cancel_deadline_timer(); cancel_deadline_timer();
bool is_invalid_request = false; bool is_invalid_request = false;
add_keep_alive_ = false; add_keep_alive_ = false;
req_ = std::move(parser_.to_request());
request& req = req_;
req.remote_ip_address = adaptor_.remote_endpoint().address().to_string();
// Create context // Create context
ctx_ = detail::context<Middlewares...>(); ctx_ = detail::context<Middlewares...>();
req.middleware_context = static_cast<void*>(&ctx_); req_.middleware_context = static_cast<void*>(&ctx_);
req.middleware_container = static_cast<void*>(middlewares_); req_.middleware_container = static_cast<void*>(middlewares_);
req.io_service = &adaptor_.get_io_service(); req_.io_service = &adaptor_.get_io_service();
req_.remote_ip_address = adaptor_.remote_endpoint().address().to_string();
add_keep_alive_ = req.keep_alive; add_keep_alive_ = req_.keep_alive;
close_connection_ = req.close_connection; close_connection_ = req_.close_connection;
if (req.check_version(1, 1)) // HTTP/1.1 if (req_.check_version(1, 1)) // HTTP/1.1
{ {
if (!req.headers.count("host")) if (!req_.headers.count("host"))
{ {
is_invalid_request = true; is_invalid_request = true;
res = response(400); res = response(400);
} }
else if (req.upgrade) else if (req_.upgrade)
{ {
// h2 or h2c headers // h2 or h2c headers
if (req.get_header_value("upgrade").substr(0, 2) == "h2") if (req_.get_header_value("upgrade").substr(0, 2) == "h2")
{ {
// TODO(ipkn): HTTP/2 // TODO(ipkn): HTTP/2
// currently, ignore upgrade header // currently, ignore upgrade header
} }
else else
{ {
detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
0, decltype(ctx_), decltype(*middlewares_)>(*middlewares_, req, res, ctx_); detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
close_connection_ = true; close_connection_ = true;
handler_->handle_upgrade(req, res, std::move(adaptor_)); handler_->handle_upgrade(req_, res, std::move(adaptor_));
return; return;
} }
} }
} }
CROW_LOG_INFO << "Request: " << boost::lexical_cast<std::string>(adaptor_.remote_endpoint()) << " " << this << " HTTP/" << (char)(req.http_ver_major + '0') << "." << (char)(req.http_ver_minor + '0') << ' ' << method_name(req.method) << " " << req.url; CROW_LOG_INFO << "Request: " << utility::lexical_cast<std::string>(adaptor_.remote_endpoint()) << " " << this << " HTTP/" << (char)(req_.http_ver_major + '0') << "." << (char)(req_.http_ver_minor + '0') << ' ' << method_name(req_.method) << " " << req_.url;
need_to_call_after_handlers_ = false; need_to_call_after_handlers_ = false;
if (!is_invalid_request) if (!is_invalid_request)
{ {
res.complete_request_handler_ = [] {}; res.complete_request_handler_ = nullptr;
res.is_alive_helper_ = [this]() -> bool { auto self = this->shared_from_this();
return adaptor_.is_open(); res.is_alive_helper_ = [self]() -> bool {
return self->adaptor_.is_open();
}; };
detail::middleware_call_helper<detail::middleware_call_criteria_only_global, detail::middleware_call_helper<detail::middleware_call_criteria_only_global,
0, decltype(ctx_), decltype(*middlewares_)>(*middlewares_, req, res, ctx_); 0, decltype(ctx_), decltype(*middlewares_)>({}, *middlewares_, req_, res, ctx_);
if (!res.completed_) if (!res.completed_)
{ {
res.complete_request_handler_ = [this] { auto self = this->shared_from_this();
this->complete_request(); res.complete_request_handler_ = [self] {
self->complete_request();
}; };
need_to_call_after_handlers_ = true; need_to_call_after_handlers_ = true;
handler_->handle(req, res); handler_->handle(req_, res, routing_handle_result_);
if (add_keep_alive_) if (add_keep_alive_)
res.set_header("connection", "Keep-Alive"); res.set_header("connection", "Keep-Alive");
} }