Skip to content
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

Jump to bottom

change ESP8266WebServer::send_P to function the same as ::send #5507

Merged
merged 11 commits into from
Feb 7, 2019
Merged

change ESP8266WebServer::send_P to function the same as ::send #5507

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f19fa51
Adjust send_P to function the same as send
dav1901 Dec 16, 2018
f9e8f16
Merge branch 'master' into issue5182
dav1901 Dec 19, 2018
715dbcd
Merge branch 'master' into issue5182
dav1901 Dec 23, 2018
954fadd
Merge branch 'master' into issue5182
dav1901 Dec 28, 2018
153173e
Merge branch 'master' into issue5182
dav1901 Jan 5, 2019
92bdf49
Merge branch 'master' into issue5182
dav1901 Jan 9, 2019
9c36e91
Merge branch 'master' into issue5182
earlephilhower Feb 4, 2019
9d2edfd
Merge branch 'master' into issue5182
dav1901 Feb 5, 2019
086d9f9
Merge branch 'master' into issue5182
earlephilhower Feb 7, 2019
cf71985
Merge branch 'master' into issue5182
earlephilhower Feb 7, 2019
1d6b63b
Merge branch 'master' into issue5182
earlephilhower Feb 7, 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
4 changes: 3 additions & 1 deletion libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,9 @@ void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {
memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type));
_prepareHeader(header, code, (const char* )type, contentLength);
_currentClientWrite(header.c_str(), header.length());
sendContent_P(content);
if (contentLength) {
sendContent_P(content);
}
}

void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
Expand Down