Merge branch 'master' into bstream2

d-a-v · d-a-v · commit e8ffe6de7b51 · 2020-01-03T14:16:02.000+01:00
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -757,7 +757,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
     }
 
     if(size > 0) {
-        addHeader("Content-Length", String(size));
+        addHeader(F("Content-Length"), String(size));
     }
 
     // send Header
@@ -1226,7 +1226,8 @@ int HTTPClient::handleHeaderResponse()
                 }
 
                 if(_canReuse && headerName.equalsIgnoreCase(F("Connection"))) {
-                    if(headerValue.indexOf("close") >= 0 && headerValue.indexOf("keep-alive") < 0) {
+                    if (headerValue.indexOf(F("close")) >= 0 &&
+                            headerValue.indexOf(F("keep-alive")) < 0) {
                         _canReuse = false;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)`
`757`	`757`	`}`
`758`	`758`
`759`	`759`	`if(size > 0) {`
`760`		`- addHeader("Content-Length", String(size));`
	`760`	`+ addHeader(F("Content-Length"), String(size));`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`// send Header`
`@@ -1226,7 +1226,8 @@ int HTTPClient::handleHeaderResponse()`
`1226`	`1226`	`}`
`1227`	`1227`
`1228`	`1228`	`if(_canReuse && headerName.equalsIgnoreCase(F("Connection"))) {`
`1229`		`- if(headerValue.indexOf("close") >= 0 && headerValue.indexOf("keep-alive") < 0) {`
	`1229`	`+ if (headerValue.indexOf(F("close")) >= 0 &&`
	`1230`	`+ headerValue.indexOf(F("keep-alive")) < 0) {`
`1230`	`1231`	`_canReuse = false;`
`1231`	`1232`	`}`
`1232`	`1233`	`}`