From f7fc8ab37714efc1e00ef640a3e4f51ca647fac5 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Fri, 5 Mar 2021 13:40:52 +0200 Subject: [PATCH] Use HTTP method table from ESP-IDF's nghttp (#4900) Fixes: #4884 * Use HTTP method table from ESP-IDF's nghttp * Parse methods using IDF's HTTP method list * Make example's loops to allow the CPU to switch tasks --- .../AdvancedWebServer/AdvancedWebServer.ino | 1 + .../examples/FSBrowser/FSBrowser.ino | 1 + .../examples/HelloServer/HelloServer.ino | 1 + .../HttpAdvancedAuth/HttpAdvancedAuth.ino | 1 + .../examples/HttpBasicAuth/HttpBasicAuth.ino | 1 + .../examples/PathArgServer/PathArgServer.ino | 1 + .../examples/SDWebServer/SDWebServer.ino | 1 + .../SimpleAuthentification.ino | 1 + .../examples/WebUpdate/WebUpdate.ino | 2 +- libraries/WebServer/src/HTTP_Method.h | 14 +++------ libraries/WebServer/src/Parsing.cpp | 30 ++++++++++++------- 11 files changed, 32 insertions(+), 22 deletions(-) diff --git a/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino b/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino index 88ad6c8a..e8e81536 100644 --- a/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino +++ b/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino @@ -125,6 +125,7 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } void drawGraph() { diff --git a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino index f49ae81c..f33f5dbe 100644 --- a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino +++ b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino @@ -300,4 +300,5 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/HelloServer/HelloServer.ino b/libraries/WebServer/examples/HelloServer/HelloServer.ino index 1a1180c2..d807ff08 100644 --- a/libraries/WebServer/examples/HelloServer/HelloServer.ino +++ b/libraries/WebServer/examples/HelloServer/HelloServer.ino @@ -70,4 +70,5 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/HttpAdvancedAuth/HttpAdvancedAuth.ino b/libraries/WebServer/examples/HttpAdvancedAuth/HttpAdvancedAuth.ino index 567fd487..e2af9550 100644 --- a/libraries/WebServer/examples/HttpAdvancedAuth/HttpAdvancedAuth.ino +++ b/libraries/WebServer/examples/HttpAdvancedAuth/HttpAdvancedAuth.ino @@ -56,4 +56,5 @@ void setup() { void loop() { ArduinoOTA.handle(); server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/HttpBasicAuth/HttpBasicAuth.ino b/libraries/WebServer/examples/HttpBasicAuth/HttpBasicAuth.ino index 7a7dcc9a..a370a245 100644 --- a/libraries/WebServer/examples/HttpBasicAuth/HttpBasicAuth.ino +++ b/libraries/WebServer/examples/HttpBasicAuth/HttpBasicAuth.ino @@ -38,4 +38,5 @@ void setup() { void loop() { ArduinoOTA.handle(); server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/PathArgServer/PathArgServer.ino b/libraries/WebServer/examples/PathArgServer/PathArgServer.ino index 0b4dc425..8482b2df 100644 --- a/libraries/WebServer/examples/PathArgServer/PathArgServer.ino +++ b/libraries/WebServer/examples/PathArgServer/PathArgServer.ino @@ -53,4 +53,5 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/SDWebServer/SDWebServer.ino b/libraries/WebServer/examples/SDWebServer/SDWebServer.ino index a3271a03..3d0e3942 100644 --- a/libraries/WebServer/examples/SDWebServer/SDWebServer.ino +++ b/libraries/WebServer/examples/SDWebServer/SDWebServer.ino @@ -310,4 +310,5 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino b/libraries/WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino index 1adf2061..98cb62eb 100644 --- a/libraries/WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino +++ b/libraries/WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino @@ -129,4 +129,5 @@ void setup(void) { void loop(void) { server.handleClient(); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/examples/WebUpdate/WebUpdate.ino b/libraries/WebServer/examples/WebUpdate/WebUpdate.ino index 843867d5..a3ae1f8a 100644 --- a/libraries/WebServer/examples/WebUpdate/WebUpdate.ino +++ b/libraries/WebServer/examples/WebUpdate/WebUpdate.ino @@ -65,5 +65,5 @@ void setup(void) { void loop(void) { server.handleClient(); - delay(1); + delay(2);//allow the cpu to switch to other tasks } diff --git a/libraries/WebServer/src/HTTP_Method.h b/libraries/WebServer/src/HTTP_Method.h index 4532332b..66d53bf8 100644 --- a/libraries/WebServer/src/HTTP_Method.h +++ b/libraries/WebServer/src/HTTP_Method.h @@ -1,15 +1,9 @@ #ifndef _HTTP_Method_H_ #define _HTTP_Method_H_ -typedef enum { - HTTP_GET = 0b00000001, - HTTP_POST = 0b00000010, - HTTP_DELETE = 0b00000100, - HTTP_PUT = 0b00001000, - HTTP_PATCH = 0b00010000, - HTTP_HEAD = 0b00100000, - HTTP_OPTIONS = 0b01000000, - HTTP_ANY = 0b01111111, -} HTTPMethod; +#include "http_parser.h" + +typedef enum http_method HTTPMethod; +#define HTTP_ANY (HTTPMethod)(255) #endif /* _HTTP_Method_H_ */ diff --git a/libraries/WebServer/src/Parsing.cpp b/libraries/WebServer/src/Parsing.cpp index ef455c8a..a5bfb071 100644 --- a/libraries/WebServer/src/Parsing.cpp +++ b/libraries/WebServer/src/Parsing.cpp @@ -30,6 +30,14 @@ #define WEBSERVER_MAX_POST_ARGS 32 #endif +#define __STR(a) #a +#define _STR(a) __STR(a) +const char * _http_method_str[] = { +#define XX(num, name, string) _STR(name), + HTTP_METHOD_MAP(XX) +#undef XX +}; + static const char Content_Type[] PROGMEM = "Content-Type"; static const char filename[] PROGMEM = "filename"; @@ -96,17 +104,17 @@ bool WebServer::_parseRequest(WiFiClient& client) { _currentUri = url; _chunked = false; - HTTPMethod method = HTTP_GET; - if (methodStr == F("POST")) { - method = HTTP_POST; - } else if (methodStr == F("DELETE")) { - method = HTTP_DELETE; - } else if (methodStr == F("OPTIONS")) { - method = HTTP_OPTIONS; - } else if (methodStr == F("PUT")) { - method = HTTP_PUT; - } else if (methodStr == F("PATCH")) { - method = HTTP_PATCH; + HTTPMethod method = HTTP_ANY; + size_t num_methods = sizeof(_http_method_str) / sizeof(const char *); + for (size_t i=0; i