Skip to content

Commit 3f129d9

Browse files
everslickigrr
authored andcommitted
allow F() to be used for uri parameter (#2319)
1 parent cd0ee07 commit 3f129d9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/ESP8266WebServer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,15 @@ void ESP8266WebServer::requestAuthentication(){
128128
send(401);
129129
}
130130

131-
void ESP8266WebServer::on(const char* uri, ESP8266WebServer::THandlerFunction handler) {
131+
void ESP8266WebServer::on(const String &uri, ESP8266WebServer::THandlerFunction handler) {
132132
on(uri, HTTP_ANY, handler);
133133
}
134134

135-
void ESP8266WebServer::on(const char* uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn) {
135+
void ESP8266WebServer::on(const String &uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn) {
136136
on(uri, method, fn, _fileUploadHandler);
137137
}
138138

139-
void ESP8266WebServer::on(const char* uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn) {
139+
void ESP8266WebServer::on(const String &uri, HTTPMethod method, ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn) {
140140
_addRequestHandler(new FunctionRequestHandler(fn, ufn, uri, method));
141141
}
142142

src/ESP8266WebServer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ class ESP8266WebServer
7777
void requestAuthentication();
7878

7979
typedef std::function<void(void)> THandlerFunction;
80-
void on(const char* uri, THandlerFunction handler);
81-
void on(const char* uri, HTTPMethod method, THandlerFunction fn);
82-
void on(const char* uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn);
80+
void on(const String &uri, THandlerFunction handler);
81+
void on(const String &uri, HTTPMethod method, THandlerFunction fn);
82+
void on(const String &uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn);
8383
void addHandler(RequestHandler* handler);
8484
void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL );
8585
void onNotFound(THandlerFunction fn); //called when handler is not assigned

src/detail/RequestHandlersImpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class FunctionRequestHandler : public RequestHandler {
77
public:
8-
FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const char* uri, HTTPMethod method)
8+
FunctionRequestHandler(ESP8266WebServer::THandlerFunction fn, ESP8266WebServer::THandlerFunction ufn, const String &uri, HTTPMethod method)
99
: _fn(fn)
1010
, _ufn(ufn)
1111
, _uri(uri)

0 commit comments

Comments
 (0)