arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Joost Jager
2015-11-23 21:22:42 +01:00
parent 34fcc911bc 866921c54a
commit ac8cfa0143
20 changed files with 890 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/ESP8266WebServer/src/ESP8266WebServer.h
View File

@ -40,12 +40,6 @@ enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END,
class ESP8266WebServer;
#include "detail/RequestHandler.h"
namespace fs {
class FS;
}
typedef struct {
HTTPUploadStatus status;
String filename;
@ -56,6 +50,12 @@ typedef struct {
uint8_t buf[HTTP_UPLOAD_BUFLEN];
} HTTPUpload;
#include "detail/RequestHandler.h"
namespace fs {
class FS;
}
class ESP8266WebServer
{
public:
@ -69,6 +69,7 @@ public:
typedef std::function<void(void)> THandlerFunction;
void on(const char* uri, THandlerFunction handler);
void on(const char* uri, HTTPMethod method, THandlerFunction fn);
void on(const char* uri, HTTPMethod method, THandlerFunction fn, THandlerFunction ufn);
void addHandler(RequestHandler* handler);
void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL );
void onNotFound(THandlerFunction fn); //called when handler is not assigned
@ -156,6 +157,7 @@ protected:
String _hostHeader;
RequestHandler* _currentHandler;
RequestHandler* _firstHandler;
RequestHandler* _lastHandler;
THandlerFunction _notFoundHandler;