arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-26 07:02:15 +03:00
Code Activity

Merge pull request #1087 from Links2004/master

Browse Source 
fix some warnings and #395
This commit is contained in:
Markus
2015-11-27 12:19:45 +01:00
parent 680c7330d3 a27029cbc5
commit 04e5623064
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino
View File

@ -47,14 +47,10 @@ File uploadFile;
void returnOK() { void returnOK() {
server.sendHeader("Connection", "close");
server.sendHeader("Access-Control-Allow-Origin", "*");
server.send(200, "text/plain", ""); server.send(200, "text/plain", "");
} }
void returnFail(String msg) { void returnFail(String msg) {
server.sendHeader("Connection", "close");
server.sendHeader("Access-Control-Allow-Origin", "*");
server.send(500, "text/plain", msg + "\r\n"); server.send(500, "text/plain", msg + "\r\n");
} }

9
libraries/ESP8266httpClient/src/ESP8266httpClient.cpp
View File

@ -36,7 +36,10 @@ httpClient::httpClient() {
_tcp = NULL; _tcp = NULL;
_tcps = NULL; _tcps = NULL;
_port = 0;
_reuse = false; _reuse = false;
_https = false;
_headerKeysCount = 0; _headerKeysCount = 0;
_currentHeaders = NULL; _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); DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] connection closed or file end (written: %d).\n", bytesWritten);
if(_size && _size != 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(); end();
@ -362,7 +365,7 @@ String httpClient::getString(void) {
if(_size) { if(_size) {
// try to reserve needed memmory // try to reserve needed memmory
if(!sstring.reserve((_size + 1))) { 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--"); return String("--too less memory--");
} }
} }
@ -511,7 +514,7 @@ bool httpClient::sendHeader(const char * type) {
} }
header += "\r\n" + _Headers + "\r\n"; header += "\r\n" + _Headers + "\r\n";
return _tcp->write(header.c_str(), header.length()); return (_tcp->write(header.c_str(), header.length()) == header.length());
} }
/** /**