Skip to content

Fix replacing of headers with overlapping names in HTTPClient. Fixes issue #3483 #3487

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
me-no-dev merged 2 commits into from
Jan 20, 2020
Merged

Fix replacing of headers with overlapping names in HTTPClient. Fixes issue #3483 #3487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
245552c
Fix replacing of headers with overlapping names. Fixes issue #3483
Nov 17, 2019
1814700
Merge branch 'master' into bugfix/HTTPClient_addHeader
me-no-dev Jan 20, 2020
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 libraries/HTTPClient/src/HTTPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ void HTTPClient::addHeader(const String& name, const String& value, bool first,

if (replace) {
int headerStart = _headers.indexOf(headerLine);
if (headerStart != -1) {
if (headerStart != -1 && (headerStart == 0 || _headers[headerStart - 1] == '\n')) {
int headerEnd = _headers.indexOf('\n', headerStart);
_headers = _headers.substring(0, headerStart) + _headers.substring(headerEnd + 1);
}
Expand All @@ -924,7 +924,6 @@ void HTTPClient::addHeader(const String& name, const String& value, bool first,
_headers += headerLine;
}
}

}

void HTTPClient::collectHeaders(const char* headerKeys[], const size_t headerKeysCount)
Expand Down