arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-07 16:23:38 +03:00
Code

allow F() to be used for uri parameter (#2319)

Browse Source
This commit is contained in:
Clemens Kirchgatterer 2016-07-26 12:23:14 +02:00 committed by Ivan Grokhotkov
parent 7900132225
commit 4dc4e75216
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View File

@ -128,15 +128,15 @@ void ESP8266WebServer::requestAuthentication(){
send(401); send(401);
} }
void ESP8266WebServer::on(const char* uri, ESP8266WebServer::THandlerFunction handler) { void ESP8266WebServer::on(const String &uri, ESP8266WebServer::THandlerFunction handler) {
on(uri, HTTP_ANY, handler); on(uri, HTTP_ANY, handler);
} }
void ESP8266WebServer::on(const char* uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn) { void ESP8266WebServer::on(const String &uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn) {
on(uri, method, fn, _fileUploadHandler); on(uri, method, fn, _fileUploadHandler);
} }
void ESP8266WebServer::on(const char* uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn) { void ESP8266WebServer::on(const String &uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn) {
_addRequestHandler(new FunctionRequestHandler(fn, ufn, uri, method)); _addRequestHandler(new FunctionRequestHandler(fn, ufn, uri, method));
} }

6
libraries/ESP8266WebServer/src/ESP8266WebServer.h
View File

@ -77,9 +77,9 @@ public:
void requestAuthentication(); void requestAuthentication();
typedef std::function<void(void)> THandlerFunction; typedef std::function<void(void)> THandlerFunction;
void on(const char* uri, THandlerFunction handler); void on(const String &uri, THandlerFunction handler);
void on(const char* uri, HTTPMethod method, THandlerFunction fn); void on(const String &uri, HTTPMethod method, THandlerFunction fn);
void on(const char* uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn); void on(const String &uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn);
void addHandler(RequestHandler* handler); void addHandler(RequestHandler* handler);
void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL ); void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL );
void onNotFound(THandlerFunction fn); //called when handler is not assigned void onNotFound(THandlerFunction fn); //called when handler is not assigned

2
libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
View File

@ -5,7 +5,7 @@
class FunctionRequestHandler : public RequestHandler { class FunctionRequestHandler : public RequestHandler {
public: public:
FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const char* uri, HTTPMethod method) FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const String &uri, HTTPMethod method)
: _fn(fn) : _fn(fn)
, _ufn(ufn) , _ufn(ufn)
, _uri(uri) , _uri(uri)