Skip to content
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

Add logic to resolve content-length transfer-encoding conflicts on response #6992

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Add logic to resolve content-length transfer-encoding conflicts on response #6992

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
19 changes: 16 additions & 3 deletions proxy/hdrs/HTTP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,10 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
if (err < 0) {
return err;
}
// Make sure the length headers are consistent
if (err == PARSE_RESULT_DONE) {
err = validate_hdr_content_length(heap, hh);
}
if ((err == PARSE_RESULT_DONE) || (err == PARSE_RESULT_CONT)) {
return err;
}
Expand Down Expand Up @@ -1287,7 +1291,12 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const

end = real_end;
parser->m_parsing_http = false;
return mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof, true);
auto ret = mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof, true);
// Make sure the length headers are consistent
if (ret == PARSE_RESULT_DONE) {
ret = validate_hdr_content_length(heap, hh);
}
return ret;
}
#endif

Expand Down Expand Up @@ -1402,8 +1411,12 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
end = real_end;
parser->m_parsing_http = false;
}

return mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof, true);
auto ret = mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof, true);
// Make sure the length headers are consistent
if (ret == PARSE_RESULT_DONE) {
ret = validate_hdr_content_length(heap, hh);
}
return ret;
}

/*-------------------------------------------------------------------------
Expand Down