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

renaming yet another variable to fix gcc name lookup

Browse Source
This commit is contained in:
Dennis Luxen 2015-01-27 13:11:04 +01:00
parent 8318b3ba83
commit 34bbd7dcaa
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/request_parser.cpp
View File

@ -35,7 +35,8 @@ namespace http
{ {
RequestParser::RequestParser() RequestParser::RequestParser()
: state(internal_state::method_start), header({"", ""}), selected_compression(no_compression) : state(internal_state::method_start), current_header({"", ""}),
selected_compression(no_compression)
{ {
} }
@ -175,27 +176,27 @@ osrm::tribool RequestParser::consume(request &current_request, const char input)
} }
return osrm::tribool::no; return osrm::tribool::no;
case internal_state::header_line_start: case internal_state::header_line_start:
if (boost::iequals(header.name, "Accept-Encoding")) if (boost::iequals(current_header.name, "Accept-Encoding"))
{ {
/* giving gzip precedence over deflate */ /* giving gzip precedence over deflate */
if (boost::icontains(header.value, "deflate")) if (boost::icontains(current_header.value, "deflate"))
{ {
selected_compression = deflate_rfc1951; selected_compression = deflate_rfc1951;
} }
if (boost::icontains(header.value, "gzip")) if (boost::icontains(current_header.value, "gzip"))
{ {
selected_compression = gzip_rfc1952; selected_compression = gzip_rfc1952;
} }
} }
if (boost::iequals(header.name, "Referer")) if (boost::iequals(current_header.name, "Referer"))
{ {
current_request.referrer = header.value; current_request.referrer = current_header.value;
} }
if (boost::iequals(header.name, "User-Agent")) if (boost::iequals(current_header.name, "User-Agent"))
{ {
current_request.agent = header.value; current_request.agent = current_header.value;
} }
if (input == '\r') if (input == '\r')
@ -208,8 +209,8 @@ osrm::tribool RequestParser::consume(request &current_request, const char input)
return osrm::tribool::no; return osrm::tribool::no;
} }
state = internal_state::header_name; state = internal_state::header_name;
header.clear(); current_header.clear();
header.name.push_back(input); current_header.name.push_back(input);
return osrm::tribool::indeterminate; return osrm::tribool::indeterminate;
case internal_state::header_lws: case internal_state::header_lws:
if (input == '\r') if (input == '\r')
@ -237,7 +238,7 @@ osrm::tribool RequestParser::consume(request &current_request, const char input)
{ {
return osrm::tribool::no; return osrm::tribool::no;
} }
header.name.push_back(input); current_header.name.push_back(input);
return osrm::tribool::indeterminate; return osrm::tribool::indeterminate;
case internal_state::space_before_header_value: case internal_state::space_before_header_value:
if (input == ' ') if (input == ' ')
@ -256,7 +257,7 @@ osrm::tribool RequestParser::consume(request &current_request, const char input)
{ {
return osrm::tribool::no; return osrm::tribool::no;
} }
header.value.push_back(input); current_header.value.push_back(input);
return osrm::tribool::indeterminate; return osrm::tribool::indeterminate;
case internal_state::expecting_newline_2: case internal_state::expecting_newline_2:
if (input == '\n') if (input == '\n')

2
server/request_parser.hpp
View File

@ -83,7 +83,7 @@ class RequestParser
expecting_newline_3 expecting_newline_3
} state; } state;
header header; header current_header;
compression_type selected_compression; compression_type selected_compression;
}; };