Skip to content

8.1.x: Fix output '\n' HTTP field line endings #8460

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
bneradt merged 1 commit into from
Oct 27, 2021
Merged

8.1.x: Fix output '\n' HTTP field line endings #8460

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
11 changes: 10 additions & 1 deletion proxy/hdrs/MIME.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2652,8 +2652,17 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char

// find_value_last
field_value_last = line_e - 1;
int suffix_count = 0;
while ((field_value_last >= field_value_first) && ParseRules::is_wslfcr(*field_value_last)) {
--field_value_last;
++suffix_count;
}

// Make sure the field ends in CRLF. If not, we'll fix the field via the n_v_raw_printable
// flag.
bool raw_print_field = true;
if (suffix_count < 2 || *(line_e - 2) != '\r' || *(line_e - 1) != '\n') {
raw_print_field = false;
}

field_name_length = (int)(field_name_last - field_name_first + 1);
Expand Down Expand Up @@ -2690,7 +2699,7 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char

MIMEField *field = mime_field_create(heap, mh);
mime_field_name_value_set(heap, mh, field, field_name_wks_idx, field_name_first, field_name_length, field_value_first,
field_value_length, true, total_line_length, false);
field_value_length, raw_print_field, total_line_length, false);
mime_hdr_field_attach(mh, field, 1, nullptr);
}
}
Expand Down