Skip to content

Fix sending headers in #send_P(int, PGM_P, PGM_P, size_t) #6881

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
d-a-v merged 3 commits into from
Dec 10, 2019
Merged

Fix sending headers in #send_P(int, PGM_P, PGM_P, size_t) #6881

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56f368d
Fix sending headers in #send_P(int, PGM_P, PGM_P, size_t)
jennytoo Dec 5, 2019
6a22a18
Merge branch 'master' into master
d-a-v Dec 5, 2019
6fbeade
Merge branch 'master' into master
devyte Dec 10, 2019
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
6 changes: 4 additions & 2 deletions libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,10 @@ void ESP8266WebServerTemplate<ServerType>::send_P(int code, PGM_P content_type,
char type[64];
memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type));
_prepareHeader(header, code, (const char* )type, contentLength);
sendContent(header);
sendContent_P(content, contentLength);
_currentClient.write((const uint8_t *)header.c_str(), header.length());
if (contentLength) {
sendContent_P(content, contentLength);
}
}

template <typename ServerType>
Expand Down