From 2cca10ec5a0ebc3bf9ade3e0d4dd5cdcc018fe3d Mon Sep 17 00:00:00 2001 From: anschrammh Date: Fri, 27 Dec 2019 10:47:02 +0100 Subject: [PATCH] Removed http specific enums, which are now part of the HttpConstants class --- src/app/WEBServer.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/WEBServer.h b/src/app/WEBServer.h index c85a49b..b0bae50 100644 --- a/src/app/WEBServer.h +++ b/src/app/WEBServer.h @@ -4,20 +4,17 @@ #include "TCPServer.h" #include "Dictionary.h" #include "SDCardManager.h" +#include "HttpConstants.h" //#define DEBUG_WEBS #define READ_WRITE_BUFFER_SIZE 2500 template -class WEBServer : public TCPServer +class WEBServer : public TCPServer, public HttpConstants { public: - enum HttpRequestMethod {UNDEFINED, GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH}; - enum HttpVersion {UNKNOWN, HTTP_0_9, HTTP_1_1, HTTP_1_0, HTTP_2_0}; - enum HttpMIMEType{UNKNOWN_MIME, TEXT_PLAIN, TEXT_CSS, TEXT_HTML, TEXT_JAVASCRIPT, APPLICATION_JSON, APPLICATION_X_WWW_FORM_URLENCODED, IMAGE_PNG, IMAGE_JPEG, AUDIO_MPEG, APPLICATION_OCTET_STREAM}; enum HttpParserStatus {HTTP_VERB, HTTP_RESSOURCE, HTTP_VERSION, HTTP_PARAMS, POST_DATA, HEADER_PARAMS}; enum WEBClientState {ACCEPTED, PARSING, QUERY_PARSED, RESPONSE_SENT, DONE}; - enum HTTP_CODE {_100, _101, _200, _400, _401, _403, _404, _405, _500, _501}; - + struct HttpRequestData { HttpRequestMethod HRM;