Commit 9e7b13e

authored

WebServer.handleClient delay (espressif#4350)

* If WebServer.handleClient is run in a tight loop, it will starve other processes. So, if there is no connection, throw in a delay(1). Fixes espressif#4348 * Made a variable to control the delay behavior

1 parent 2243081 commit 9e7b13eCopy full SHA for 9e7b13e

File tree

2 files changed

+11

-0

lines changed

libraries/WebServer/src
- WebServer.cpp
- WebServer.h

2 files changed

+11

-0

lines changed

`‎libraries/WebServer/src/WebServer.cpp‎`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ WebServer::WebServer(IPAddress addr, int port)`
`45`	`45`	`, _currentVersion(0)`
`46`	`46`	`, _currentStatus(HC_NONE)`
`47`	`47`	`, _statusChange(0)`
	`48`	`+, _nullDelay(true)`
`48`	`49`	`, _currentHandler(nullptr)`
`49`	`50`	`, _firstHandler(nullptr)`
`50`	`51`	`, _lastHandler(nullptr)`
`@@ -66,6 +67,7 @@ WebServer::WebServer(int port)`
`66`	`67`	`, _currentVersion(0)`
`67`	`68`	`, _currentStatus(HC_NONE)`
`68`	`69`	`, _statusChange(0)`
	`70`	`+, _nullDelay(true)`
`69`	`71`	`, _currentHandler(nullptr)`
`70`	`72`	`, _firstHandler(nullptr)`
`71`	`73`	`, _lastHandler(nullptr)`
`@@ -280,6 +282,9 @@ void WebServer::handleClient() {`
`280`	`282`	`if (_currentStatus == HC_NONE) {`
`281`	`283`	`WiFiClient client = _server.available();`
`282`	`284`	`if (!client) {`
	`285`	`+ if (_nullDelay) {`
	`286`	`+ delay(1);`
	`287`	`+ }`
`283`	`288`	`return;`
`284`	`289`	`}`
`285`	`290`
`@@ -370,6 +375,10 @@ void WebServer::setContentLength(const size_t contentLength) {`
`370`	`375`	`_contentLength = contentLength;`
`371`	`376`	`}`
`372`	`377`
	`378`	`+void WebServer::enableDelay(boolean value) {`
	`379`	`+ _nullDelay = value;`
	`380`	`+}`
	`381`	`+`
`373`	`382`	`void WebServer::enableCORS(boolean value) {`
`374`	`383`	`_corsEnabled = value;`
`375`	`384`	`}`

`‎libraries/WebServer/src/WebServer.h‎`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ class WebServer`
`123`	`123`	`void send_P(int code, PGM_P content_type, PGM_P content);`
`124`	`124`	`void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength);`
`125`	`125`
	`126`	`+ void enableDelay(boolean value);`
`126`	`127`	`void enableCORS(boolean value = true);`
`127`	`128`	`void enableCrossOrigin(boolean value = true);`
`128`	`129`
`@@ -176,6 +177,7 @@ class WebServer`
`176`	`177`	`uint8_t _currentVersion;`
`177`	`178`	`HTTPClientStatus _currentStatus;`
`178`	`179`	`unsigned long _statusChange;`
	`180`	`+ boolean _nullDelay;`
`179`	`181`
`180`	`182`	`RequestHandler* _currentHandler;`
`181`	`183`	`RequestHandler* _firstHandler;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 9e7b13e

File tree

2 files changed

2 files changed

`‎libraries/WebServer/src/WebServer.cpp‎`

`‎libraries/WebServer/src/WebServer.h‎`

0 commit comments