Merge pull request #9 from edwinvp/upload_file_fixes

Fix file upload handler by adjusting function signatures

Author: khoih-prog

changelog.md

@@ -28,6 +28,11 @@
 
 ## Changelog
 
+### Releases v1.7.0
+
+1. Fix file upload to Teensy 4.1 board based on suggestions made on the PJRC forum. Align signatures of file upload handlers.
+For more details, please see this post: [AsyncWebServer_Teensy41 bug onUpload](https://forum.pjrc.com/index.php?threads/asyncwebserver_teensy41-bug-onupload.72220).
+
 ### Releases v1.6.2
 
 1. Add examples [Async_WebSocketsServer](https://github.com/khoih-prog/AsyncWebServer_Teensy41/tree/main/examples/Async_WebSocketsServer) to demo how to use `Async_WebSockets`

src/AsyncJson_Teensy41.h

@@ -405,7 +405,7 @@ class AsyncCallbackJsonWebHandler: public AsyncWebHandler
 
     /////////////////////////////////////////////////
 
-    virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data,
+    virtual void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data,
                               size_t len, bool final) override final
     {
     }

src/AsyncWebHandlerImpl_Teensy41.h

@@ -193,6 +193,14 @@ class AsyncCallbackWebHandler: public AsyncWebHandler
 
     /////////////////////////////////////////////////
 
+    virtual void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) override final
+    {
+      if (_onUpload)
+        _onUpload(request, filename, index, data, len, final);
+    }
+
+    /////////////////////////////////////////////////
+
     virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index,
                             size_t total) override final
     {

src/AsyncWebRequest_Teensy41.cpp

@@ -587,9 +587,10 @@ void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last)
   if (last || _itemBufferIndex == 1460)
   {
     //check if authenticated before calling the upload
-    if (_handler)
+    if (_handler) 
+    {
       _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
-
+    }
     _itemBufferIndex = 0;
   }
 }

src/AsyncWebServer_Teensy41.hpp

@@ -629,7 +629,7 @@ class AsyncWebHandler
     /////////////////////////////////////////////////
 
     virtual void handleRequest(AsyncWebServerRequest *request __attribute__((unused))) {}
-    virtual void handleUpload(AsyncWebServerRequest *request  __attribute__((unused)), const String& filename __attribute__((unused)), 
+    virtual void handleUpload(AsyncWebServerRequest *request  __attribute__((unused)), String filename __attribute__((unused)), 
                  size_t index __attribute__((unused)), uint8_t *data __attribute__((unused)), size_t len __attribute__((unused)), 
                  bool final  __attribute__((unused))) {}
     virtual void handleBody(AsyncWebServerRequest *request __attribute__((unused)), uint8_t *data __attribute__((unused)), 
@@ -697,7 +697,7 @@ class AsyncWebServerResponse
  * */
 
 typedef std::function<void(AsyncWebServerRequest *request)> ArRequestHandlerFunction;
-typedef std::function<void(AsyncWebServerRequest *request, /*const String& filename,*/ size_t index, uint8_t *data, size_t len, bool final)> ArUploadHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final)> ArUploadHandlerFunction;
 typedef std::function<void(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total)> ArBodyHandlerFunction;
 
 /////////////////////////////////////////////////////////