Skip to content

Commit 04e5623

Browse files
committed
Merge pull request #1087 from Links2004/master
fix some warnings and #395
2 parents 680c733 + a27029c commit 04e5623

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

libraries/ESP8266WebServer/examples/SDWebServer/SDWebServer.ino

-4
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ File uploadFile;
4747

4848

4949
void returnOK() {
50-
server.sendHeader("Connection", "close");
51-
server.sendHeader("Access-Control-Allow-Origin", "*");
5250
server.send(200, "text/plain", "");
5351
}
5452

5553
void returnFail(String msg) {
56-
server.sendHeader("Connection", "close");
57-
server.sendHeader("Access-Control-Allow-Origin", "*");
5854
server.send(500, "text/plain", msg + "\r\n");
5955
}
6056

libraries/ESP8266httpClient/src/ESP8266httpClient.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ httpClient::httpClient() {
3636
_tcp = NULL;
3737
_tcps = NULL;
3838

39+
_port = 0;
40+
3941
_reuse = false;
42+
_https = false;
4043

4144
_headerKeysCount = 0;
4245
_currentHeaders = NULL;
@@ -345,7 +348,7 @@ int httpClient::writeToStream(Stream * stream) {
345348
DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] connection closed or file end (written: %d).\n", bytesWritten);
346349

347350
if(_size && _size != bytesWritten) {
348-
DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d missmatch!.\n", bytesWritten, _size);
351+
DEBUG_HTTPCLIENT("[HTTP-Client][writeToStream] bytesWritten %d and size %d mismatch!.\n", bytesWritten, _size);
349352
}
350353

351354
end();
@@ -362,7 +365,7 @@ String httpClient::getString(void) {
362365
if(_size) {
363366
// try to reserve needed memmory
364367
if(!sstring.reserve((_size + 1))) {
365-
DEBUG_HTTPCLIENT("[HTTP-Client][getString] too less memory to resive as string! need: %d\n", (_size + 1));
368+
DEBUG_HTTPCLIENT("[HTTP-Client][getString] too less memory to reserve as string! need: %d\n", (_size + 1));
366369
return String("--too less memory--");
367370
}
368371
}
@@ -511,7 +514,7 @@ bool httpClient::sendHeader(const char * type) {
511514
}
512515
header += "\r\n" + _Headers + "\r\n";
513516

514-
return _tcp->write(header.c_str(), header.length());
517+
return (_tcp->write(header.c_str(), header.length()) == header.length());
515518
}
516519

517520
/**

0 commit comments

Comments
 (0)