Use HTTP method table from ESP-IDF's nghttp (espressif#4900)

me-no-dev · web-flow · commit f7fc8ab37714 · 2021-03-05T13:40:52.000+02:00
Fixes: espressif#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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<num_methods; i++){
+ if (methodStr == _http_method_str[i]){
+ method = (HTTPMethod)i;
+ break;
+ }
+ }
+ if (method == HTTP_ANY){
+ log_e("Unknown HTTP Method: %s", methodStr.c_str());
+ return false;
 }
 _currentMethod = method;
 

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ void setup(void){`
`125`	`125`
`126`	`126`	`voidloop(void){`
`127`	`127`	`server.handleClient();`
	`128`	`+delay(2);//allow the cpu to switch to other tasks`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`voiddrawGraph(){`
Original file line number	Diff line number	Diff line change
`@@ -300,4 +300,5 @@ void setup(void){`
`300`	`300`
`301`	`301`	`voidloop(void){`
`302`	`302`	`server.handleClient();`
	`303`	`+delay(2);//allow the cpu to switch to other tasks`
`303`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,5 @@ void setup(void){`
`70`	`70`
`71`	`71`	`voidloop(void){`
`72`	`72`	`server.handleClient();`
	`73`	`+delay(2);//allow the cpu to switch to other tasks`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,5 @@ void setup(){`
`56`	`56`	`voidloop(){`
`57`	`57`	`ArduinoOTA.handle();`
`58`	`58`	`server.handleClient();`
	`59`	`+delay(2);//allow the cpu to switch to other tasks`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,5 @@ void setup(){`
`38`	`38`	`voidloop(){`
`39`	`39`	`ArduinoOTA.handle();`
`40`	`40`	`server.handleClient();`
	`41`	`+delay(2);//allow the cpu to switch to other tasks`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,5 @@ void setup(void){`
`53`	`53`
`54`	`54`	`voidloop(void){`
`55`	`55`	`server.handleClient();`
	`56`	`+delay(2);//allow the cpu to switch to other tasks`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,4 +310,5 @@ void setup(void){`
`310`	`310`
`311`	`311`	`voidloop(void){`
`312`	`312`	`server.handleClient();`
	`313`	`+delay(2);//allow the cpu to switch to other tasks`
`313`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,4 +129,5 @@ void setup(void){`
`129`	`129`
`130`	`130`	`voidloop(void){`
`131`	`131`	`server.handleClient();`
	`132`	`+delay(2);//allow the cpu to switch to other tasks`
`132`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,5 +65,5 @@ void setup(void){`
`65`	`65`
`66`	`66`	`voidloop(void){`
`67`	`67`	`server.handleClient();`
`68`		`-delay(1);`
	`68`	`+delay(2);//allow the cpu to switch to other tasks`
`69`	`69`	`}`
-Original file line number
+Diff line change
@@ @@ -1,15 +1,9 @@ @@
 #ifndef_HTTP_Method_H_
 #define_HTTP_Method_H_
 -typedefenum{
 -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"
++
 +typedefenumhttp_methodHTTPMethod;
 +#defineHTTP_ANY (HTTPMethod)(255)
 #endif/* _HTTP_Method_H_ */