jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ServerBase::read_request_and_content to ServerBase::read, and ServerBase::write_response to ServerBase::write

Browse source
This commit is contained in:
eidheim 2017-11-18 13:56:54 +01:00
commit 0c8da107a6
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server_http.hpp
View file

@ -430,7 +430,7 @@ namespace SimpleWeb {
return connection; return connection;
} }
void read_request_and_content(const std::shared_ptr<Session> &session) { void read(const std::shared_ptr<Session> &session) {
session->connection->set_timeout(config.timeout_request); session->connection->set_timeout(config.timeout_request);
asio::async_read_until(*session->connection->socket, session->request->streambuf, "\r\n\r\n", [this, session](const error_code &ec, std::size_t bytes_transferred) { asio::async_read_until(*session->connection->socket, session->request->streambuf, "\r\n\r\n", [this, session](const error_code &ec, std::size_t bytes_transferred) {
session->connection->cancel_timeout(); session->connection->cancel_timeout();
@ -618,24 +618,24 @@ namespace SimpleWeb {
return; return;
} }
} }
// Find path- and method-match, and call write_response // Find path- and method-match, and call write
for(auto &regex_method : resource) { for(auto &regex_method : resource) {
auto it = regex_method.second.find(session->request->method); auto it = regex_method.second.find(session->request->method);
if(it != regex_method.second.end()) { if(it != regex_method.second.end()) {
regex::smatch sm_res; regex::smatch sm_res;
if(regex::regex_match(session->request->path, sm_res, regex_method.first)) { if(regex::regex_match(session->request->path, sm_res, regex_method.first)) {
session->request->path_match = std::move(sm_res); session->request->path_match = std::move(sm_res);
write_response(session, it->second); write(session, it->second);
return; return;
} }
} }
} }
auto it = default_resource.find(session->request->method); auto it = default_resource.find(session->request->method);
if(it != default_resource.end()) if(it != default_resource.end())
write_response(session, it->second); write(session, it->second);
} }
void write_response(const std::shared_ptr<Session> &session, void write(const std::shared_ptr<Session> &session,
std::function<void(std::shared_ptr<typename ServerBase<socket_type>::Response>, std::shared_ptr<typename ServerBase<socket_type>::Request>)> &resource_function) { std::function<void(std::shared_ptr<typename ServerBase<socket_type>::Response>, std::shared_ptr<typename ServerBase<socket_type>::Request>)> &resource_function) {
session->connection->set_timeout(config.timeout_content); session->connection->set_timeout(config.timeout_content);
auto response = std::shared_ptr<Response>(new Response(session, config.timeout_content), [this](Response *response_ptr) { auto response = std::shared_ptr<Response>(new Response(session, config.timeout_content), [this](Response *response_ptr) {
@ -651,13 +651,13 @@ namespace SimpleWeb {
return; return;
else if(case_insensitive_equal(it->second, "keep-alive")) { else if(case_insensitive_equal(it->second, "keep-alive")) {
auto new_session = std::make_shared<Session>(this->config.max_request_streambuf_size, response->session->connection); auto new_session = std::make_shared<Session>(this->config.max_request_streambuf_size, response->session->connection);
this->read_request_and_content(new_session); this->read(new_session);
return; return;
} }
} }
if(response->session->request->http_version >= "1.1") { if(response->session->request->http_version >= "1.1") {
auto new_session = std::make_shared<Session>(this->config.max_request_streambuf_size, response->session->connection); auto new_session = std::make_shared<Session>(this->config.max_request_streambuf_size, response->session->connection);
this->read_request_and_content(new_session); this->read(new_session);
return; return;
} }
} }
@ -707,7 +707,7 @@ namespace SimpleWeb {
error_code ec; error_code ec;
session->connection->socket->set_option(option, ec); session->connection->socket->set_option(option, ec);
this->read_request_and_content(session); this->read(session);
} }
else if(this->on_error) else if(this->on_error)
this->on_error(session->request, ec); this->on_error(session->request, ec);

2
server_https.hpp
View file

@ -72,7 +72,7 @@ namespace SimpleWeb {
if(!lock) if(!lock)
return; return;
if(!ec) if(!ec)
this->read_request_and_content(session); this->read(session);
else if(this->on_error) else if(this->on_error)
this->on_error(session->request, ec); this->on_error(session->request, ec);
}); });