feedc0de/ESPAsyncWebServer
1
0
Fork 0
forked from me-no-dev/ESPAsyncWebServer
Code Pull Requests Activity

Make ResponseStream resize when needed and actually work

Browse Source
This commit is contained in:
Me No Dev
2016-02-01 01:42:45 +02:00
parent b84fc1c976
commit 729b9c223e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WebResponses.cpp
View File

@@ -289,7 +289,7 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, u
if(!_sendContentLength || _ackedLength >= (_headLength+_contentLength)){ if(!_sendContentLength || _ackedLength >= (_headLength+_contentLength)){
_state = RESPONSE_END; _state = RESPONSE_END;
if(!_chunked && !_sendContentLength) if(!_chunked && !_sendContentLength)
request->client()->close(); request->client()->close(true);
} }
} }
return 0; return 0;
@@ -423,10 +423,13 @@ size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen){
} }
size_t AsyncResponseStream::write(const uint8_t *data, size_t len){ size_t AsyncResponseStream::write(const uint8_t *data, size_t len){
if(_finished() || (_content->room() == 0 && ETS_INTR_WITHINISR())) if(_finished())
return 0; return 0;
if(len > _content->available())
len = _content->available(); if(len > _content->room()){
size_t needed = len - _content->room();
_content->resizeAdd(needed);
}
return _content->write((const char*)data, len); return _content->write((const char*)data, len);
} }