Skip to content

fix(HTTP): error boundary in HTTP-Header, Content-Type #4953

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(HTTP): error boundary in HTTP-Header, Content-Type #4953

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
3 changes: 1 addition & 2 deletions Net/src/HTMLForm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,8 @@ void HTMLForm::prepareSubmit(HTTPRequest& request, int options)
{
_boundary = MultipartWriter::createBoundary();
std::string ct(_encoding);
ct.append("; boundary=\"");
ct.append("; boundary=");
ct.append(_boundary);
ct.append("\"");
request.setContentType(ct);
}
if (request.getVersion() == HTTPMessage::HTTP_1_0)
Expand Down
10 changes: 4 additions & 6 deletions Net/testsuite/src/HTMLFormTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void HTMLFormTest::testReadMultipart()
"--MIME_boundary_0123456789--\r\n"
);
HTTPRequest req("POST", "/form.cgi");
req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=\"MIME_boundary_0123456789\"");
req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=MIME_boundary_0123456789");
StringPartHandler sah;
HTMLForm form(req, istr, sah);
assertTrue (form.size() == 4);
Expand Down Expand Up @@ -309,9 +309,8 @@ void HTMLFormTest::testSubmit3()
HTTPRequest req("POST", "/form.cgi", HTTPMessage::HTTP_1_1);
form.prepareSubmit(req);
std::string expCT(HTMLForm::ENCODING_MULTIPART);
expCT.append("; boundary=\"");
expCT.append("; boundary=");
expCT.append(form.boundary());
expCT.append("\"");
assertTrue (req.getContentType() == expCT);
assertTrue (req.getChunkedTransferEncoding());
}
Expand Down Expand Up @@ -343,9 +342,8 @@ void HTMLFormTest::testSubmit5()
HTTPRequest req("POST", "/form.cgi", HTTPMessage::HTTP_1_1);
form.prepareSubmit(req, HTMLForm::OPT_USE_CONTENT_LENGTH);
std::string expCT(HTMLForm::ENCODING_MULTIPART);
expCT.append("; boundary=\"");
expCT.append("; boundary=");
expCT.append(form.boundary());
expCT.append("\"");
assertTrue (req.getContentType() == expCT);
assertTrue (req.getContentLength() == 403);
}
Expand Down Expand Up @@ -395,7 +393,7 @@ void HTMLFormTest::testFieldLimitMultipart()
"--MIME_boundary_0123456789--\r\n"
);
HTTPRequest req("POST", "/form.cgi");
req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=\"MIME_boundary_0123456789\"");
req.setContentType(HTMLForm::ENCODING_MULTIPART + "; boundary=MIME_boundary_0123456789");
StringPartHandler sah;
HTMLForm form;
form.setFieldLimit(3);
Expand Down
2 changes: 1 addition & 1 deletion Net/testsuite/src/MediaTypeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void MediaTypeTest::testParse()
assertTrue (mt3.getParameter("param1") == "value1");
assertTrue (mt3.getParameter("PARAM2") == "value 2");

MediaType mt4("multipart/mixed; boundary=\"MIME_boundary_01234567\"");
MediaType mt4("multipart/mixed; boundary=MIME_boundary_01234567");
assertTrue (mt4.getType() == "multipart");
assertTrue (mt4.getSubType() == "mixed");
assertTrue (mt4.parameters().size() == 1);
Expand Down
2 changes: 1 addition & 1 deletion Net/testsuite/src/MessageHeaderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ void MessageHeaderTest::testSplitParameters()
assertTrue (p.size() == 1);
assertTrue (p["boundary"] == "MIME_boundary_01234567");

s = "multipart/related; boundary=\"MIME_boundary_76543210\"";
s = "multipart/related; boundary=MIME_boundary_76543210";
MessageHeader::splitParameters(s, v, p);
assertTrue (v == "multipart/related");
assertTrue (p.size() == 1);
Expand Down