Skip to content

Commit e97a9fa

Browse files
committed
Merge branch 'master' of https://github.com/esp8266/Arduino into rx-fifo-latency-fix
2 parents 001be65 + bb90e12 commit e97a9fa

File tree

3 files changed

+2
-32
lines changed

3 files changed

+2
-32
lines changed

libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ ESP8266WebServer::ESP8266WebServer(int port)
8181
}
8282

8383
ESP8266WebServer::~ESP8266WebServer() {
84+
close();
8485
if (_currentHeaders)
8586
delete[]_currentHeaders;
8687
_headerKeysCount = 0;
@@ -90,7 +91,6 @@ ESP8266WebServer::~ESP8266WebServer() {
9091
delete handler;
9192
handler = next;
9293
}
93-
close();
9494
}
9595

9696
void ESP8266WebServer::begin() {

libraries/GDBStub/library.json

Lines changed: 0 additions & 30 deletions
This file was deleted.

tools/sdk/ld/eagle.app.v6.common.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ SECTIONS
9696
*.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
9797
*.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
9898
/* project dependencies */
99-
*.pioenvs\\*\\lib*\lib*.a:(.literal*, .text*)
99+
*.pioenvs\\*\\lib*\\lib*.a:(.literal*, .text*)
100100
*.pioenvs/*/lib*/lib*.a:(.literal*, .text*)
101101
/* project source objects */
102102
*.pioenvs\\*\\src\\*.o(.literal*, .text*)

0 commit comments

Comments
 (0)