Skip to content

Translate grammar errors to http errors at parse sites #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashtum merged 1 commit into from
Aug 30, 2026
Merged

Translate grammar errors to http errors at parse sites #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/detail/header.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,10 +1125,12 @@ parse_start_line(
it, end, request_line_rule);
if(! rv)
{
ec = rv.error();
if( ec == system::error_code(grammar::error::need_more) &&
new_size == lim.max_start_line)
if( rv.error() != grammar::error::need_more )
ec = rv.error();
else if( new_size == lim.max_start_line )
ec = error::start_line_limit;
else
ec = error::need_data;
return;
}
// method
Expand Down Expand Up @@ -1164,10 +1166,12 @@ parse_start_line(
it, end, status_line_rule);
if(! rv)
{
ec = rv.error();
if( ec == system::error_code(grammar::error::need_more) &&
new_size == lim.max_start_line)
if( rv.error() != grammar::error::need_more )
ec = rv.error();
else if( new_size == lim.max_start_line )
ec = error::start_line_limit;
else
ec = error::need_data;
return;
}
// version
Expand Down Expand Up @@ -1216,19 +1220,20 @@ parse_field(
it, end, field_rule);
if(rv.has_error())
{
ec = rv.error();
if(ec == system::error_code(grammar::error::end_of_range))
if(rv.error() == grammar::error::end_of_range)
{
// final CRLF
h.size = static_cast<
header::offset_type>(it - h.cbuf);
ec = error::end_of_message;
return;
}
if( ec == system::error_code(grammar::error::need_more) &&
new_size == lim.max_field)
{
if( rv.error() != grammar::error::need_more )
ec = rv.error();
else if( new_size == lim.max_field )
ec = error::field_size_limit;
}
else
ec = error::need_data;
return;
}
if(h.count >= lim.max_fields)
Expand Down Expand Up @@ -1285,7 +1290,7 @@ parse(
*this, lim, new_size, ec);
if(ec)
{
if( ec == system::error_code(grammar::error::need_more) &&
if( ec == error::need_data &&
new_size == lim.max_fields)
{
ec = error::headers_limit;
Expand All @@ -1299,7 +1304,7 @@ parse(
*this, lim, new_size, ec);
if(ec)
{
if( ec == system::error_code(grammar::error::need_more) &&
if( ec == error::need_data &&
new_size == lim.max_size)
{
ec = error::headers_limit;
Expand All @@ -1308,7 +1313,7 @@ parse(
break;
}
}
if(ec == system::error_code(grammar::error::end_of_range))
if(ec == error::end_of_message)
ec = {};
}

Expand Down
8 changes: 1 addition & 7 deletions src/error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,8 @@ equivalent(
{
case condition::invalid_payload:
return (ec == error::bad_payload);

case condition::need_more_input:
if( ec == system::error_code(
urls::grammar::error::need_more) ||
ec == error::need_data )
return true;
break;

return ec == error::need_data;
default:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/fields_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ verify_field_value(
grammar::parse(it, end, detail::field_value_rule);
if( rv.has_error() )
{
if( rv.error() == condition::need_more_input )
if( rv.error() == grammar::error::need_more )
return error::bad_field_value;
return rv.error();
}
Expand Down
4 changes: 1 addition & 3 deletions test/unit/error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

// Test that header file is self-contained.
#include <boost/http/error.hpp>
#include <boost/url/grammar/error.hpp>

#include <memory>

Expand Down Expand Up @@ -111,8 +110,7 @@ class error_test

check(n,
condition::need_more_input,
system::error_code(
urls::grammar::error::need_more));
error::need_data);
check(n,
condition::invalid_payload,
error::bad_payload);
Expand Down
Loading