Compatible with ESP32 up to 2.0.0

Author: Tinyu-Zhao

examples/Advanced/WIFI/WiFiSetting/WebServer.cpp

@@ -53,7 +53,8 @@ WebServer::WebServer(IPAddress addr, int port)
       _headerKeysCount(0),
       _currentHeaders(0),
       _contentLength(0),
-      _chunked(false) {}
+      _chunked(false) {
+}
 
 WebServer::WebServer(int port)
     : _server(port),
@@ -69,7 +70,8 @@ WebServer::WebServer(int port)
       _headerKeysCount(0),
       _currentHeaders(0),
       _contentLength(0),
-      _chunked(false) {}
+      _chunked(false) {
+}
 
 WebServer::~WebServer() {
     if (_currentHeaders) delete[] _currentHeaders;
@@ -227,9 +229,13 @@ void WebServer::handleClient() {
     }
 }
 
-void WebServer::close() { _server.end(); }
+void WebServer::close() {
+    _server.end();
+}
 
-void WebServer::stop() { close(); }
+void WebServer::stop() {
+    close();
+}
 
 void WebServer::sendHeader(const String& name, const String& value,
                            bool first) {
@@ -378,7 +384,9 @@ String WebServer::argName(int i) {
     return String();
 }
 
-int WebServer::args() { return _currentArgCount; }
+int WebServer::args() {
+    return _currentArgCount;
+}
 
 bool WebServer::hasArg(String name) {
     for (int i = 0; i < _currentArgCount; ++i) {
@@ -416,7 +424,9 @@ String WebServer::headerName(int i) {
     return String();
 }
 
-int WebServer::headers() { return _headerKeysCount; }
+int WebServer::headers() {
+    return _headerKeysCount;
+}
 
 bool WebServer::hasHeader(String name) {
     for (int i = 0; i < _headerKeysCount; ++i) {
@@ -427,11 +437,17 @@ bool WebServer::hasHeader(String name) {
     return false;
 }
 
-String WebServer::hostHeader() { return _hostHeader; }
+String WebServer::hostHeader() {
+    return _hostHeader;
+}
 
-void WebServer::onFileUpload(THandlerFunction fn) { _fileUploadHandler = fn; }
+void WebServer::onFileUpload(THandlerFunction fn) {
+    _fileUploadHandler = fn;
+}
 
-void WebServer::onNotFound(THandlerFunction fn) { _notFoundHandler = fn; }
+void WebServer::onNotFound(THandlerFunction fn) {
+    _notFoundHandler = fn;
+}
 
 void WebServer::_handleRequest() {
     bool handled = false;

examples/Advanced/WIFI/WiFiSetting/WebServer.h

@@ -48,10 +48,11 @@ enum HTTPClientStatus { HC_NONE, HC_WAIT_READ, HC_WAIT_CLOSE };
 
 #define HTTP_DOWNLOAD_UNIT_SIZE 1460
 #define HTTP_UPLOAD_BUFLEN      2048
-#define HTTP_MAX_DATA_WAIT      1000  // ms to wait for the client to send the
-                                      // request
-#define HTTP_MAX_POST_WAIT 1000       // ms to wait for POST data to arrive
-#define HTTP_MAX_SEND_WAIT 5000       // ms to wait for data chunk to be ACKed
+#define HTTP_MAX_DATA_WAIT \
+    1000                         // ms to wait for the client to send the
+                                 // request
+#define HTTP_MAX_POST_WAIT 1000  // ms to wait for POST data to arrive
+#define HTTP_MAX_SEND_WAIT 5000  // ms to wait for data chunk to be ACKed
 #define HTTP_MAX_CLOSE_WAIT \
     2000  // ms to wait for the client to close the connection
 
@@ -103,10 +104,18 @@ class WebServer {
                                              // assigned
     void onFileUpload(THandlerFunction fn);  // handle file uploads
 
-    String uri() { return _currentUri; }
-    HTTPMethod method() { return _currentMethod; }
-    WiFiClient client() { return _currentClient; }
-    HTTPUpload& upload() { return _currentUpload; }
+    String uri() {
+        return _currentUri;
+    }
+    HTTPMethod method() {
+        return _currentMethod;
+    }
+    WiFiClient client() {
+        return _currentClient;
+    }
+    HTTPUpload& upload() {
+        return _currentUpload;
+    }
 
     String arg(String name);   // get request argument value by name
     String arg(int i);         // get request argument value by number