From a0cd7520bad9941eda2fd1c029d9c689f8c89c59 Mon Sep 17 00:00:00 2001 From: eidheim Date: Mon, 12 Jun 2017 08:22:40 +0200 Subject: [PATCH] Made Client::create_request_header const, and cleanup of indentations in Client --- client_http.hpp | 26 ++++++++++---------------- client_https.hpp | 15 +++++---------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/client_http.hpp b/client_http.hpp index e371c63..7845ee7 100644 --- a/client_http.hpp +++ b/client_http.hpp @@ -224,7 +224,7 @@ namespace SimpleWeb { } } - std::shared_ptr create_request_header(const std::string& request_type, const std::string& path, const std::map& header) { + std::shared_ptr create_request_header(const std::string& request_type, const std::string& path, const std::map& header) const { auto corrected_path=path; if(corrected_path=="") corrected_path="/"; @@ -262,7 +262,7 @@ namespace SimpleWeb { auto timer=get_timeout_timer(); asio::async_read_until(*socket, response->content_buffer, "\r\n\r\n", - [this, &response, &chunked_streambuf, timer](const error_code& ec, size_t bytes_transferred) { + [this, &response, &chunked_streambuf, timer](const error_code& ec, size_t bytes_transferred) { if(timer) timer->cancel(); if(!ec) { @@ -275,9 +275,8 @@ namespace SimpleWeb { auto content_length=stoull(header_it->second); if(content_length>num_additional_bytes) { auto timer=get_timeout_timer(); - asio::async_read(*socket, response->content_buffer, - asio::transfer_exactly(content_length-num_additional_bytes), - [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read(*socket, response->content_buffer, asio::transfer_exactly(content_length-num_additional_bytes), + [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { @@ -293,8 +292,7 @@ namespace SimpleWeb { } else if(response->http_version<"1.1" || ((header_it=response->header.find("Connection"))!=response->header.end() && header_it->second=="close")) { auto timer=get_timeout_timer(); - asio::async_read(*socket, response->content_buffer, - [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read(*socket, response->content_buffer, [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { @@ -320,8 +318,7 @@ namespace SimpleWeb { void request_read_chunked(const std::shared_ptr &response, asio::streambuf &streambuf) { auto timer=get_timeout_timer(); - asio::async_read_until(*socket, response->content_buffer, "\r\n", - [this, &response, &streambuf, timer](const error_code& ec, size_t bytes_transferred) { + asio::async_read_until(*socket, response->content_buffer, "\r\n", [this, &response, &streambuf, timer](const error_code& ec, size_t bytes_transferred) { if(timer) timer->cancel(); if(!ec) { @@ -355,9 +352,8 @@ namespace SimpleWeb { if((2+length)>num_additional_bytes) { auto timer=get_timeout_timer(); - asio::async_read(*socket, response->content_buffer, - asio::transfer_exactly(2+length-num_additional_bytes), - [this, post_process, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read(*socket, response->content_buffer, asio::transfer_exactly(2+length-num_additional_bytes), + [this, post_process, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(!ec) { @@ -402,8 +398,7 @@ namespace SimpleWeb { auto proxy_host_port=parse_host_port(config.proxy_server, 8080); query=std::unique_ptr(new asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second))); } - resolver.async_resolve(*query, [this](const error_code &ec, - asio::ip::tcp::resolver::iterator it){ + resolver.async_resolve(*query, [this](const error_code &ec, asio::ip::tcp::resolver::iterator it){ if(!ec) { { std::lock_guard lock(socket_mutex); @@ -411,8 +406,7 @@ namespace SimpleWeb { } auto timer=get_timeout_timer(config.timeout_connect); - asio::async_connect(*socket, it, [this, timer] - (const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ + asio::async_connect(*socket, it, [this, timer](const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ if(timer) timer->cancel(); if(!ec) { diff --git a/client_https.hpp b/client_https.hpp index 6cf8847..94c69e7 100644 --- a/client_https.hpp +++ b/client_https.hpp @@ -50,8 +50,7 @@ namespace SimpleWeb { auto proxy_host_port=parse_host_port(config.proxy_server, 8080); query=std::unique_ptr(new asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second))); } - resolver.async_resolve(*query, [this] - (const error_code &ec, asio::ip::tcp::resolver::iterator it){ + resolver.async_resolve(*query, [this] (const error_code &ec, asio::ip::tcp::resolver::iterator it){ if(!ec) { { std::lock_guard lock(socket_mutex); @@ -59,8 +58,7 @@ namespace SimpleWeb { } auto timer=get_timeout_timer(config.timeout_connect); - asio::async_connect(socket->lowest_layer(), it, [this, timer] - (const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ + asio::async_connect(socket->lowest_layer(), it, [this, timer] (const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ if(timer) timer->cancel(); if(!ec) { @@ -89,8 +87,7 @@ namespace SimpleWeb { auto host_port=host+':'+std::to_string(port); write_stream << "CONNECT "+host_port+" HTTP/1.1\r\n" << "Host: " << host_port << "\r\n\r\n"; auto timer=get_timeout_timer(); - asio::async_write(socket->next_layer(), write_buffer, - [this, timer](const error_code &ec, size_t /*bytes_transferred*/) { + asio::async_write(socket->next_layer(), write_buffer, [this, timer](const error_code &ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { @@ -104,8 +101,7 @@ namespace SimpleWeb { std::shared_ptr response(new Response()); timer=get_timeout_timer(); - asio::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n", - [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n", [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { @@ -125,8 +121,7 @@ namespace SimpleWeb { } auto timer=get_timeout_timer(); - this->socket->async_handshake(asio::ssl::stream_base::client, - [this, timer](const error_code& ec) { + this->socket->async_handshake(asio::ssl::stream_base::client, [this, timer](const error_code& ec) { if(timer) timer->cancel(); if(ec) {