From 8318b3ba8333a4c279d5fd706603814b91909e88 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 27 Jan 2015 13:01:33 +0100 Subject: [PATCH] rename variable to be more telling that it's not a type but a variable --- Server/Connection.cpp | 35 +++++++++++++++++++---------------- server/request_parser.cpp | 10 +++++----- server/request_parser.hpp | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Server/Connection.cpp b/Server/Connection.cpp index 1dd5ae5f1..0f16f465f 100644 --- a/Server/Connection.cpp +++ b/Server/Connection.cpp @@ -67,14 +67,15 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t // no error detected, let's parse the request compression_type compression_type(no_compression); osrm::tribool result; - std::tie(result, compression_type) = RequestParser().parse( - request, incoming_data_buffer.data(), incoming_data_buffer.data() + bytes_transferred); + std::tie(result, compression_type) = + RequestParser().parse(current_request, incoming_data_buffer.data(), + incoming_data_buffer.data() + bytes_transferred); // the request has been parsed if (result == osrm::tribool::yes) { - request.endpoint = TCP_socket.remote_endpoint().address(); - request_handler.handle_request(request, reply); + current_request.endpoint = TCP_socket.remote_endpoint().address(); + request_handler.handle_request(current_request, current_reply); // Header compression_header; std::vector compressed_output; @@ -85,24 +86,26 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t { case deflate_rfc1951: // use deflate for compression - reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"}); - compressed_output = compress_buffers(reply.content, compression_type); - reply.set_size(static_cast(compressed_output.size())); - output_buffer = reply.headers_to_buffers(); + current_reply.headers.insert(current_reply.headers.begin(), + {"Content-Encoding", "deflate"}); + compressed_output = compress_buffers(current_reply.content, compression_type); + current_reply.set_size(static_cast(compressed_output.size())); + output_buffer = current_reply.headers_to_buffers(); output_buffer.push_back(boost::asio::buffer(compressed_output)); break; case gzip_rfc1952: // use gzip for compression - reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"}); - compressed_output = compress_buffers(reply.content, compression_type); - reply.set_size(static_cast(compressed_output.size())); - output_buffer = reply.headers_to_buffers(); + current_reply.headers.insert(current_reply.headers.begin(), + {"Content-Encoding", "gzip"}); + compressed_output = compress_buffers(current_reply.content, compression_type); + current_reply.set_size(static_cast(compressed_output.size())); + output_buffer = current_reply.headers_to_buffers(); output_buffer.push_back(boost::asio::buffer(compressed_output)); break; case no_compression: // don't use any compression - reply.set_uncompressed_size(); - output_buffer = reply.to_buffers(); + current_reply.set_uncompressed_size(); + output_buffer = current_reply.to_buffers(); break; } // write result to stream @@ -113,10 +116,10 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t } else if (result == osrm::tribool::no) { // request is not parseable - reply = reply::stock_reply(reply::bad_request); + current_reply = reply::stock_reply(reply::bad_request); boost::asio::async_write( - TCP_socket, reply.to_buffers(), + TCP_socket, current_reply.to_buffers(), strand.wrap(boost::bind(&Connection::handle_write, this->shared_from_this(), boost::asio::placeholders::error))); } diff --git a/server/request_parser.cpp b/server/request_parser.cpp index 258c89198..833eb937c 100644 --- a/server/request_parser.cpp +++ b/server/request_parser.cpp @@ -35,7 +35,7 @@ namespace http { RequestParser::RequestParser() - : state(internal_state::method_start), header({"", ""}), compression_type(no_compression) + : state(internal_state::method_start), header({"", ""}), selected_compression(no_compression) { } @@ -47,11 +47,11 @@ RequestParser::parse(request ¤t_request, char *begin, char *end) osrm::tribool result = consume(current_request, *begin++); if (result != osrm::tribool::indeterminate) { - return std::make_tuple(result, compression_type); + return std::make_tuple(result, selected_compression); } } osrm::tribool result = osrm::tribool::indeterminate; - return std::make_tuple(result, compression_type); + return std::make_tuple(result, selected_compression); } osrm::tribool RequestParser::consume(request ¤t_request, const char input) @@ -180,11 +180,11 @@ osrm::tribool RequestParser::consume(request ¤t_request, const char input) /* giving gzip precedence over deflate */ if (boost::icontains(header.value, "deflate")) { - compression_type = deflate_rfc1951; + selected_compression = deflate_rfc1951; } if (boost::icontains(header.value, "gzip")) { - compression_type = gzip_rfc1952; + selected_compression = gzip_rfc1952; } } diff --git a/server/request_parser.hpp b/server/request_parser.hpp index c7a72071e..35786690e 100644 --- a/server/request_parser.hpp +++ b/server/request_parser.hpp @@ -84,7 +84,7 @@ class RequestParser } state; header header; - compression_type compression_type; + compression_type selected_compression; }; } // namespace http