Skip to content

Fixed error condition for when content-length=0 is set on a response … #153

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
merged 2 commits into from
Oct 24, 2019
Merged

Fixed error condition for when content-length=0 is set on a response … #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c467bc
Fixed error condition for when content-length=0 is set on a response …
JonathanHenson Oct 24, 2019
dc66bdc
Merge branch 'master' into allow_zero_content_length
JonathanHenson Oct 24, 2019
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
19 changes: 10 additions & 9 deletions source/h1_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,15 +526,6 @@ static int s_linestate_header(struct aws_h1_decoder *decoder, struct aws_byte_cu
return aws_raise_error(AWS_ERROR_HTTP_PROTOCOL_ERROR);
}

if (decoder->body_headers_forbidden) {
AWS_LOGF_ERROR(
AWS_LS_HTTP_STREAM,
"id=%p: Incoming headers for content-length received, but it is illegal for this message to have a "
"body",
decoder->logging_id);
return aws_raise_error(AWS_ERROR_HTTP_PROTOCOL_ERROR);
}

if (s_read_size(header.value_data, &decoder->content_length) != AWS_OP_SUCCESS) {
AWS_LOGF_ERROR(
AWS_LS_HTTP_STREAM,
Expand All @@ -547,6 +538,16 @@ static int s_linestate_header(struct aws_h1_decoder *decoder, struct aws_byte_cu
AWS_BYTE_CURSOR_PRI(header.value_data));
return AWS_OP_ERR;
}

if (decoder->body_headers_forbidden && decoder->content_length != 0) {
AWS_LOGF_ERROR(
AWS_LS_HTTP_STREAM,
"id=%p: Incoming headers for content-length received, but it is illegal for this message to have a "
"body",
decoder->logging_id);
return aws_raise_error(AWS_ERROR_HTTP_PROTOCOL_ERROR);
}

break;

case AWS_HTTP_HEADER_TRANSFER_ENCODING: {
Expand Down