Thanks to visit codestin.com
Credit goes to github.com

Skip to content

webserver hook: allow to handle external http protocol #7459

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 14 commits into from
Jul 28, 2020
Merged

webserver hook: allow to handle external http protocol #7459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a9f3b6f
webhook api
d-a-v Jul 12, 2020
457272c
ditto
d-a-v Jul 15, 2020
dd8b5f7
Merge branch 'master' into webhook
d-a-v Jul 15, 2020
e27a8f4
simplify webserver debug printouts, move text to flash
d-a-v Jul 17, 2020
5365d6e
style
d-a-v Jul 17, 2020
b55feba
nothing against Hungarians
d-a-v Jul 17, 2020
bfc12fb
Hook examples in HelloServer example
d-a-v Jul 17, 2020
d24441f
remove debug comment
d-a-v Jul 17, 2020
724a74f
sorry hungarians (again)
d-a-v Jul 17, 2020
fbf4ca3
print executable code address in example
d-a-v Jul 17, 2020
93f2fbd
fix emulation on host
d-a-v Jul 17, 2020
9e45256
Merge branch 'master' into webhook
d-a-v Jul 17, 2020
0e4b110
simplify example per @mcspr suggestion
d-a-v Jul 17, 2020
a8f93c0
Merge branch 'master' into webhook
d-a-v Jul 28, 2020
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
Prev Previous commit
Next Next commit
sorry hungarians (again)
  • Loading branch information
@d-a-v
d-a-v committed Jul 17, 2020
commit 724a74fd255d5d611cc92d5b05a70b527737e1a6
6 changes: 3 additions & 3 deletions libraries/ESP8266WebServer/src/ESP8266WebServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ class ESP8266WebServerTemplate
using ClientType = typename ServerType::ClientType;
using RequestHandlerType = RequestHandler<ServerType>;
using WebServerType = ESP8266WebServerTemplate<ServerType>;
enum ClientFuture_e { CLIENT_REQUEST_CAN_CONTINUE, CLIENT_REQUEST_IS_HANDLED, CLIENT_MUST_STOP, CLIENT_IS_GIVEN };
enum ClientFuture { CLIENT_REQUEST_CAN_CONTINUE, CLIENT_REQUEST_IS_HANDLED, CLIENT_MUST_STOP, CLIENT_IS_GIVEN };
typedef String (*ContentTypeFunction) (const String&);
using HookFunction = std::function<ClientFuture_e(const String& method, const String& url, WiFiClient* client, ContentTypeFunction contentType)>;
using HookFunction = std::function<ClientFuture(const String& method, const String& url, WiFiClient* client, ContentTypeFunction contentType)>;

void begin();
void begin(uint16_t port);
Expand Down Expand Up @@ -227,7 +227,7 @@ class ESP8266WebServerTemplate
void _addRequestHandler(RequestHandlerType* handler);
void _handleRequest();
void _finalizeResponse();
ClientFuture_e _parseRequest(ClientType& client);
ClientFuture _parseRequest(ClientType& client);
void _parseArguments(const String& data);
int _parseArgumentsPrivate(const String& data, std::function<void(String&,String&,const String&,int,int,int,int)> handler);
bool _parseForm(ClientType& client, const String& boundary, uint32_t len);
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP8266WebServer/src/Parsing-impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static bool readBytesWithTimeout(typename ServerType::ClientType& client, size_t
}

template <typename ServerType>
typename ESP8266WebServerTemplate<ServerType>::ClientFuture_e ESP8266WebServerTemplate<ServerType>::_parseRequest(ClientType& client) {
typename ESP8266WebServerTemplate<ServerType>::ClientFuture ESP8266WebServerTemplate<ServerType>::_parseRequest(ClientType& client) {
// Read the first line of HTTP request
String req = client.readStringUntil('\r');
DBGWS("request: %s\n", req.c_str());
Expand Down