Skip to content

add ESP8266WebServer::sendContent_P and ESP8266WebServer::send_P with contentLength #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 18, 2015
Merged

add ESP8266WebServer::sendContent_P and ESP8266WebServer::send_P with contentLength #753

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b0cdee
add W25Q40 chipid
martinayotte Sep 4, 2015
ea694f1
fix bug in WiFiClient::write_P when content was binary
martinayotte Sep 6, 2015
c783162
add ESP8266WebServer::sendContent_P with 'size_t size' argument for b…
martinayotte Sep 6, 2015
ea6c7bb
fix bug in WiFiClient::write_P/ESP8266WebServer::sendContent_P introd…
martinayotte Sep 6, 2015
b554d32
fix bug in WiFiClient::write_P/ESP8266WebServer::sendContent_P introd…
martinayotte Sep 6, 2015
418ce4c
add ESP8266WebServer::send_P with contentLength argument
martinayotte Sep 6, 2015
63dc2f5
Merge remote-tracking branch 'upstream/esp8266' into esp8266
martinayotte Sep 9, 2015
26537be
temporarly fix for handling PGM_P content_type properly in ESP8266Web…
martinayotte Sep 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
return (2_MB);
case 0x1440EF: // W25Q80
return (1_MB);
case 0x1340EF: // W25Q40
return (512_kB);

default:
return 0;
Expand Down
27 changes: 27 additions & 0 deletions hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {
sendContent_P(content);
}

void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
String header;
_prepareHeader(header, code, String(FPSTR(content_type)).c_str(), contentLength);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch, you are calling c_str() method of a temporary String instance here. Better move String declaration into a separate line.

sendContent(header);
sendContent_P(content, contentLength);
}

void ESP8266WebServer::send(int code, char* content_type, const String& content) {
send(code, (const char*)content_type, content);
}
Expand Down Expand Up @@ -221,6 +228,26 @@ void ESP8266WebServer::sendContent_P(PGM_P content) {
}
}

void ESP8266WebServer::sendContent_P(PGM_P content, size_t size) {
char contentUnit[HTTP_DOWNLOAD_UNIT_SIZE + 1];
contentUnit[HTTP_DOWNLOAD_UNIT_SIZE] = '\0';
size_t remaining_size = size;

while (content != NULL && remaining_size > 0) {
size_t contentUnitLen = HTTP_DOWNLOAD_UNIT_SIZE;

if (remaining_size < HTTP_DOWNLOAD_UNIT_SIZE) contentUnitLen = remaining_size;
// due to the memcpy signature, lots of casts are needed
memcpy_P((void*)contentUnit, (PGM_VOID_P)content, contentUnitLen);

content += contentUnitLen;
remaining_size -= contentUnitLen;

// write is so overloaded, had to use the cast to get it pick the right one
_currentClient.write((const char*)contentUnit, contentUnitLen);
}
}

String ESP8266WebServer::arg(const char* name) {
for (int i = 0; i < _currentArgCount; ++i) {
if (_currentArgs[i].key == name)
Expand Down
2 changes: 2 additions & 0 deletions hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ class ESP8266WebServer
void send(int code, char* content_type, const String& content);
void send(int code, const String& content_type, const String& content);
void send_P(int code, PGM_P content_type, PGM_P content);
void send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength);

void setContentLength(size_t contentLength) { _contentLength = contentLength; }
void sendHeader(const String& name, const String& value, bool first = false);
void sendContent(const String& content);
void sendContent_P(PGM_P content);
void sendContent_P(PGM_P content, size_t size);

template<typename T> size_t streamFile(T &file, const String& contentType){
setContentLength(file.size());
Expand Down
31 changes: 13 additions & 18 deletions hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,24 +186,19 @@ size_t WiFiClient::write_P(PGM_P buf, size_t size)

char chunkUnit[WIFICLIENT_MAX_PACKET_SIZE + 1];
chunkUnit[WIFICLIENT_MAX_PACKET_SIZE] = '\0';
while (buf != NULL)
{
size_t chunkUnitLen;
PGM_P chunkNext;
chunkNext = (PGM_P)memccpy_P((void*)chunkUnit, (PGM_VOID_P)buf, 0, WIFICLIENT_MAX_PACKET_SIZE);
if (chunkNext == NULL)
{
// no terminator, more data available
buf += WIFICLIENT_MAX_PACKET_SIZE;
chunkUnitLen = WIFICLIENT_MAX_PACKET_SIZE;
}
else
{
// reached terminator
chunkUnitLen = chunkNext - buf;
buf = NULL;
}
if (size < WIFICLIENT_MAX_PACKET_SIZE) chunkUnitLen = size;
size_t remaining_size = size;

while (buf != NULL && remaining_size > 0) {
size_t chunkUnitLen = WIFICLIENT_MAX_PACKET_SIZE;

if (remaining_size < WIFICLIENT_MAX_PACKET_SIZE) chunkUnitLen = remaining_size;
// due to the memcpy signature, lots of casts are needed
memcpy_P((void*)chunkUnit, (PGM_VOID_P)buf, chunkUnitLen);

buf += chunkUnitLen;
remaining_size -= chunkUnitLen;

// write is so overloaded, had to use the cast to get it pick the right one
_client->write((const char*)chunkUnit, chunkUnitLen);
}
return size;
Expand Down