Recognize URI in request lines (#1720)
This commit is contained in:
parent
d7ae3a21b3
commit
d3dbaed60a
|
@ -56,15 +56,25 @@ bool HttpRequestParser::processRequestLine(const char *begin, const char *end)
|
||||||
const char *space = std::find(start, end, ' ');
|
const char *space = std::find(start, end, ' ');
|
||||||
if (space != end)
|
if (space != end)
|
||||||
{
|
{
|
||||||
const char *question = std::find(start, space, '?');
|
const char *slash = std::find(start, space, '/');
|
||||||
if (question != space)
|
if (slash != start && slash + 1 < space && *(slash + 1) == '/')
|
||||||
{
|
{
|
||||||
request_->setPath(start, question);
|
// scheme precedents
|
||||||
request_->setQuery(question + 1, space);
|
slash = std::find(slash + 2, space, '/');
|
||||||
|
}
|
||||||
|
const char *question = std::find(slash, space, '?');
|
||||||
|
if (slash != space)
|
||||||
|
{
|
||||||
|
request_->setPath(slash, question);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
request_->setPath(start, space);
|
// An empty abs_path is equivalent to an abs_path of "/"
|
||||||
|
request_->setPath("/");
|
||||||
|
}
|
||||||
|
if (question != space)
|
||||||
|
{
|
||||||
|
request_->setQuery(question + 1, space);
|
||||||
}
|
}
|
||||||
start = space + 1;
|
start = space + 1;
|
||||||
succeed = end - start == 8 && std::equal(start, end - 1, "HTTP/1.");
|
succeed = end - start == 8 && std::equal(start, end - 1, "HTTP/1.");
|
||||||
|
|
Loading…
Reference in New Issue