Skip to content

Commit b2ad96d

Browse files
committed
feat: allowing all strings, including flash strings, as a URI
1 parent b7625f8 commit b2ad96d

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/ESPAsyncWebServer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,10 @@ class AsyncWebServer {
443443
// In case of false is returned, filter must set own handler
444444
AsyncWebServer& setFilter(ArRequestFilterFunction fn);
445445

446-
AsyncCallbackWebHandler& on(const char* uri, ArRequestHandlerFunction onRequest);
447-
AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest);
448-
AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload);
449-
AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody);
446+
AsyncCallbackWebHandler& on(const String &uri, ArRequestHandlerFunction onRequest);
447+
AsyncCallbackWebHandler& on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest);
448+
AsyncCallbackWebHandler& on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload);
449+
AsyncCallbackWebHandler& on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody);
450450

451451
AsyncStaticWebHandler& serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control = NULL);
452452

src/WebServer.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ void AsyncWebServer::_attachHandler(AsyncWebServerRequest *request){
144144
}
145145

146146

147-
AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody){
147+
AsyncCallbackWebHandler& AsyncWebServer::on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody){
148148
AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
149149
handler->setUri(uri);
150150
handler->setMethod(method);
@@ -155,7 +155,7 @@ AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodCom
155155
return *handler;
156156
}
157157

158-
AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload){
158+
AsyncCallbackWebHandler& AsyncWebServer::on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload){
159159
AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
160160
handler->setUri(uri);
161161
handler->setMethod(method);
@@ -165,7 +165,7 @@ AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodCom
165165
return *handler;
166166
}
167167

168-
AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest){
168+
AsyncCallbackWebHandler& AsyncWebServer::on(const String &uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest){
169169
AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
170170
handler->setUri(uri);
171171
handler->setMethod(method);
@@ -174,7 +174,7 @@ AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodCom
174174
return *handler;
175175
}
176176

177-
AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, ArRequestHandlerFunction onRequest){
177+
AsyncCallbackWebHandler& AsyncWebServer::on(const String &uri, ArRequestHandlerFunction onRequest){
178178
AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
179179
handler->setUri(uri);
180180
handler->onRequest(onRequest);

0 commit comments

Comments
 (0)