Fix replacing of headers with overlapping names. Fixes issue #3483 (#3487)

Jeroen88 · me-no-dev · commit 7de17176403f · 2020-01-20T15:27:51.000+02:00
If two headers with overlapping names are added while replace == true, like in:
```cpp
http.addHeader("api_token",  "pMXFOLpinQqajaRQJYMeWObg2XYmcX1");
http.addHeader("token", "1234");
```
then replacing went wrong. This is fixed with this PR.
diff --git a/libraries/HTTPClient/src/HTTPClient.cpp b/libraries/HTTPClient/src/HTTPClient.cpp
@@ -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);
             }
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ void HTTPClient::addHeader(const String& name, const String& value, bool first,`
`910`	`910`
`911`	`911`	`if (replace) {`
`912`	`912`	`int headerStart = _headers.indexOf(headerLine);`
`913`		`- if (headerStart != -1) {`
	`913`	`+ if (headerStart != -1 && (headerStart == 0 \|\| _headers[headerStart - 1] == '\n')) {`
`914`	`914`	`int headerEnd = _headers.indexOf('\n', headerStart);`
`915`	`915`	`_headers = _headers.substring(0, headerStart) + _headers.substring(headerEnd + 1);`
`916`	`916`	`}`
`@@ -924,7 +924,6 @@ void HTTPClient::addHeader(const String& name, const String& value, bool first,`
`924`	`924`	`_headers += headerLine;`
`925`	`925`	`}`
`926`	`926`	`}`
`927`		`-`
`928`	`927`	`}`
`929`	`928`
`930`	`929`	`void HTTPClient::collectHeaders(const char* headerKeys[], const size_t headerKeysCount)`