Commit c80e972

committed

fix(webserver): Use client() instead of _currentClient

this makes it possible to create derived classes properly.

1 parent 7a9a10c commit c80e972Copy full SHA for c80e972

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ void WebServer::chunkResponseBegin(const char *contentType) {`
`565`	`565`	`}`
`566`	`566`
`567`	`567`	`_chunkedResponseActive = true;`
`568`		`- _chunkedClient = _currentClient;`
	`568`	`+ _chunkedClient = client();`
`569`	`569`
`570`	`570`	`_contentLength = CONTENT_LENGTH_UNKNOWN;`
`571`	`571`
`@@ -574,7 +574,7 @@ void WebServer::chunkResponseBegin(const char *contentType) {`
`574`	`574`	`_currentClientWrite(header.c_str(), header.length());`
`575`	`575`
`576`	`576`	`_chunkedResponseActive = true;`
`577`		`- _chunkedClient = _currentClient;`
	`577`	`+ _chunkedClient = client();`
`578`	`578`	`}`
`579`	`579`
`580`	`580`	`void WebServer::chunkWrite(const char *data, size_t length) {`
`@@ -734,7 +734,7 @@ void WebServer::sendContent(const char *content, size_t contentLength) {`
`734`	`734`	`}`
`735`	`735`	`_currentClientWrite(content, contentLength);`
`736`	`736`	`if (_chunked) {`
`737`		`- _currentClient.write(footer, 2);`
	`737`	`+ client().write(footer, 2);`
`738`	`738`	`if (contentLength == 0) {`
`739`	`739`	`_chunked = false;`
`740`	`740`	`}`
`@@ -757,7 +757,7 @@ void WebServer::sendContent_P(PGM_P content, size_t size) {`
`757`	`757`	`}`
`758`	`758`	`_currentClientWrite_P(content, size);`
`759`	`759`	`if (_chunked) {`
`760`		`- _currentClient.write(footer, 2);`
	`760`	`+ client().write(footer, 2);`
`761`	`761`	`if (size == 0) {`
`762`	`762`	`_chunked = false;`
`763`	`763`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ class WebServer {`
`237`	`237`
`238`	`238`	`template<typename T> size_t streamFile(T &file, const String &contentType, const int code = 200) {`
`239`	`239`	`_streamFileCore(file.size(), file.name(), contentType, code);`
`240`		`- return _currentClient.write(file);`
	`240`	`+ return client().write(file);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`bool _eTagEnabled = false;`
`@@ -251,10 +251,10 @@ class WebServer {`
`251`	`251`
`252`	`252`	`protected:`
`253`	`253`	`virtual size_t _currentClientWrite(const char *b, size_t l) {`
`254`		`- return _currentClient.write(b, l);`
	`254`	`+ return client().write(b, l);`
`255`	`255`	`}`
`256`	`256`	`virtual size_t _currentClientWrite_P(PGM_P b, size_t l) {`
`257`		`- return _currentClient.write_P(b, l);`
	`257`	`+ return client().write_P(b, l);`
`258`	`258`	`}`
`259`	`259`	`void _addRequestHandler(RequestHandler *handler);`
`260`	`260`	`bool _removeRequestHandler(RequestHandler *handler);`

Comments

(0)