From 072b7f82b5970c8d31d58bb4ea280c3d8f9002f9 Mon Sep 17 00:00:00 2001
From: Mathieu Carbou <mathieu.carbou@gmail.com>
Date: Thu, 12 Sep 2024 00:08:01 +0200
Subject: [PATCH] Fix last commit

---
 src/ESPAsyncWebServer.h | 11 +----------
 src/WebServer.cpp       | 11 +++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h
index 00386fa..4f75c06 100644
--- a/src/ESPAsyncWebServer.h
+++ b/src/ESPAsyncWebServer.h
@@ -772,16 +772,7 @@ class AsyncWebServer {
     bool removeHandler(AsyncWebHandler* handler);
 
     AsyncCallbackWebHandler& on(const char* uri, ArRequestHandlerFunction onRequest) { return on(uri, HTTP_ANY, onRequest); }
-    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload = nullptr, ArBodyHandlerFunction onBody = nullptr) {
-      AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
-      handler->setUri(uri);
-      handler->setMethod(method);
-      handler->onRequest(onRequest);
-      handler->onUpload(onUpload);
-      handler->onBody(onBody);
-      addHandler(handler);
-      return *handler;
-    }
+    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload = nullptr, ArBodyHandlerFunction onBody = nullptr);
 
     AsyncStaticWebHandler& serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control = NULL);
 
diff --git a/src/WebServer.cpp b/src/WebServer.cpp
index f2ea0a2..588bd01 100644
--- a/src/WebServer.cpp
+++ b/src/WebServer.cpp
@@ -158,6 +158,17 @@ void AsyncWebServer::_attachHandler(AsyncWebServerRequest* request) {
   request->setHandler(_catchAllHandler);
 }
 
+AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethodComposite method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody) {
+  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+  handler->setUri(uri);
+  handler->setMethod(method);
+  handler->onRequest(onRequest);
+  handler->onUpload(onUpload);
+  handler->onBody(onBody);
+  addHandler(handler);
+  return *handler;
+}
+
 AsyncStaticWebHandler& AsyncWebServer::serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control) {
   AsyncStaticWebHandler* handler = new AsyncStaticWebHandler(uri, fs, path, cache_control);
   addHandler(handler);