Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

rename variable to make name lookup not fail on gcc

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-27 12:52:55 +01:00
parent 9672f00ec3
commit 6768ecc3fc
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/connection.cpp
View File

@ -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 // no error detected, let's parse the request
compression_type compression_type(no_compression); compression_type compression_type(no_compression);
osrm::tribool result; osrm::tribool result;
std::tie(result, compression_type) = RequestParser().parse( std::tie(result, compression_type) =
request, incoming_data_buffer.data(), incoming_data_buffer.data() + bytes_transferred); RequestParser().parse(current_request, incoming_data_buffer.data(),
incoming_data_buffer.data() + bytes_transferred);
// the request has been parsed // the request has been parsed
if (result == osrm::tribool::yes) if (result == osrm::tribool::yes)
{ {
request.endpoint = TCP_socket.remote_endpoint().address(); current_request.endpoint = TCP_socket.remote_endpoint().address();
request_handler.handle_request(request, reply); request_handler.handle_request(current_request, current_reply);
// Header compression_header; // Header compression_header;
std::vector<char> compressed_output; std::vector<char> compressed_output;
@ -85,24 +86,26 @@ void Connection::handle_read(const boost::system::error_code &error, std::size_t
{ {
case deflate_rfc1951: case deflate_rfc1951:
// use deflate for compression // use deflate for compression
reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"}); current_reply.headers.insert(current_reply.headers.begin(),
compressed_output = compress_buffers(reply.content, compression_type); {"Content-Encoding", "deflate"});
reply.set_size(static_cast<unsigned>(compressed_output.size())); compressed_output = compress_buffers(current_reply.content, compression_type);
output_buffer = reply.headers_to_buffers(); current_reply.set_size(static_cast<unsigned>(compressed_output.size()));
output_buffer = current_reply.headers_to_buffers();
output_buffer.push_back(boost::asio::buffer(compressed_output)); output_buffer.push_back(boost::asio::buffer(compressed_output));
break; break;
case gzip_rfc1952: case gzip_rfc1952:
// use gzip for compression // use gzip for compression
reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"}); current_reply.headers.insert(current_reply.headers.begin(),
compressed_output = compress_buffers(reply.content, compression_type); {"Content-Encoding", "gzip"});
reply.set_size(static_cast<unsigned>(compressed_output.size())); compressed_output = compress_buffers(current_reply.content, compression_type);
output_buffer = reply.headers_to_buffers(); current_reply.set_size(static_cast<unsigned>(compressed_output.size()));
output_buffer = current_reply.headers_to_buffers();
output_buffer.push_back(boost::asio::buffer(compressed_output)); output_buffer.push_back(boost::asio::buffer(compressed_output));
break; break;
case no_compression: case no_compression:
// don't use any compression // don't use any compression
reply.set_uncompressed_size(); current_reply.set_uncompressed_size();
output_buffer = reply.to_buffers(); output_buffer = current_reply.to_buffers();
break; break;
} }
// write result to stream // 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) else if (result == osrm::tribool::no)
{ // request is not parseable { // request is not parseable
reply = reply::stock_reply(reply::bad_request); current_reply = reply::stock_reply(reply::bad_request);
boost::asio::async_write( 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(), strand.wrap(boost::bind(&Connection::handle_write, this->shared_from_this(),
boost::asio::placeholders::error))); boost::asio::placeholders::error)));
} }

4
server/connection.hpp
View File

@ -83,8 +83,8 @@ class Connection : public std::enable_shared_from_this<Connection>
boost::asio::ip::tcp::socket TCP_socket; boost::asio::ip::tcp::socket TCP_socket;
RequestHandler &request_handler; RequestHandler &request_handler;
boost::array<char, 8192> incoming_data_buffer; boost::array<char, 8192> incoming_data_buffer;
request request; request current_request;
reply reply; reply current_reply;
}; };
} // namespace http } // namespace http