From 3b6512ea1ded7724d03774e691e36ec5d13e6bb7 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Wed, 25 Nov 2015 20:29:05 +0100 Subject: [PATCH 1/2] fix some warnings typo --- libraries/ESP8266httpClient/src/ESP8266httpClient.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/ESP8266httpClient/src/ESP8266httpClient.cpp b/libraries/ESP8266httpClient/src/ESP8266httpClient.cpp index 2c22b328f5..4b29695b79 100644 --- a/libraries/ESP8266httpClient/src/ESP8266httpClient.cpp +++ b/libraries/ESP8266httpClient/src/ESP8266httpClient.cpp @@ -36,7 +36,10 @@ httpClient::httpClient() { _tcp = NULL; _tcps = NULL; + _port = 0; + _reuse = false; + _https = false; _headerKeysCount = 0; _currentHeaders = NULL; @@ -345,7 +348,7 @@ int httpClient::writeToStream(Stream * stream) { DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] connection closed or file end (written: %d).\n", bytesWritten); if(_size && _size != bytesWritten) { - DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d missmatch!.\n", bytesWritten, _size); + DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d mismatch!.\n", bytesWritten, _size); } end(); @@ -362,7 +365,7 @@ String httpClient::getString(void) { if(_size) { // try to reserve needed memmory if(!sstring.reserve((_size + 1))) { - DEBUG_HTTPCLIENT("[HTTP-Client][getString] too less memory to resive as string! need: %d\n", (_size + 1)); + DEBUG_HTTPCLIENT("[HTTP-Client][getString] too less memory to reserve as string! need: %d\n", (_size + 1)); return String("--too less memory--"); } } @@ -511,7 +514,7 @@ bool httpClient::sendHeader(const char * type) { } header += "\r\n" + _Headers + "\r\n"; - return _tcp->write(header.c_str(), header.length()); + return (_tcp->write(header.c_str(), header.length()) == header.length()); } /** From a27029cbc5de6cdf7abcfab69af7da201a01ba14 Mon Sep 17 00:00:00 2001 From: Markus Sattler Date: Fri, 27 Nov 2015 09:47:06 +0100 Subject: [PATCH 2/2] see #395 server.send() already injects the "Connection" and "Access-Control-Allow-Origin" headers. No point in doing that twice. (browsers could get confused) --- .../ESP8266WebServer/examples/SDWebServer/SDWebServer.ino | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino b/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino index b42b1d097f..69bcaba90a 100644 --- a/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino +++ b/libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino @@ -47,14 +47,10 @@ File uploadFile; void returnOK() { - server.sendHeader("Connection", "close"); - server.sendHeader("Access-Control-Allow-Origin", "*"); server.send(200, "text/plain", ""); } void returnFail(String msg) { - server.sendHeader("Connection", "close"); - server.sendHeader("Access-Control-Allow-Origin", "*"); server.send(500, "text/plain", msg + "\r\n"); }