xPablo.cz/ESPAsyncWebServer
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: xPablo.cz:b25b62ceb9e8ab0e4c43d0f4f01f4b1b50fd52c8
Branches Tags
xPablo.cz:master
xPablo.cz:feature/esphomeFork
xPablo.cz:feature/vortigont
xPablo.cz:patches
..
compare: xPablo.cz:f05e2352433d05d79f77d68fadeeee02f735a349
Branches Tags
xPablo.cz:master
xPablo.cz:feature/esphomeFork
xPablo.cz:feature/vortigont
xPablo.cz:patches

No commits in common. "b25b62ceb9e8ab0e4c43d0f4f01f4b1b50fd52c8" and "f05e2352433d05d79f77d68fadeeee02f735a349" have entirely different histories.
b25b62ceb9 ... f05e235243

7 changed files with 13 additions and 22 deletions
Show Stats Expand all files Collapse all files

4
library.json
View File

@ -12,8 +12,8 @@
"type": "git", "type": "git",
"url": "https://github.com/esphome/ESPAsyncWebServer.git" "url": "https://github.com/esphome/ESPAsyncWebServer.git"
}, },
"version": "3.1.0", "version": "3.0.0",
"license": "LGPL-3.0", "license": "LGPL-3.0",
"frameworks": "arduino", "frameworks": "arduino",
"platforms": ["espressif8266", "espressif32", "libretiny"] "platforms": ["espressif8266", "espressif32", "libretuya"]
} }

4
src/AsyncEventSource.h
View File

@ -22,7 +22,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <Arduino.h> #include <Arduino.h>
#if defined(ESP32) || defined(LIBRETINY) #if defined(ESP32) || defined(LIBRETUYA)
#include <AsyncTCP.h> #include <AsyncTCP.h>
#else #else
#include <ESPAsyncTCP.h> #include <ESPAsyncTCP.h>
@ -43,7 +43,7 @@
#endif #endif
#endif #endif
#if defined(ESP32) || defined(LIBRETINY) #if defined(ESP32) || defined(LIBRETUYA)
#define DEFAULT_MAX_SSE_CLIENTS 8 #define DEFAULT_MAX_SSE_CLIENTS 8
#else #else
#define DEFAULT_MAX_SSE_CLIENTS 4 #define DEFAULT_MAX_SSE_CLIENTS 4

2
src/AsyncWebSocket.cpp
View File

@ -102,7 +102,7 @@ size_t webSocketSendFrame(AsyncClient *client, bool final, uint8_t opcode, bool
return 0; return 0;
} }
} }
if (!client->send()) return 0; client->send();
return len; return len;
} }

8
src/AsyncWebSocket.h
View File

@ -22,17 +22,13 @@
#define ASYNCWEBSOCKET_H_ #define ASYNCWEBSOCKET_H_
#include <Arduino.h> #include <Arduino.h>
#if defined(ESP32) || defined(LIBRETINY) #if defined(ESP32) || defined(LIBRETUYA)
#include <AsyncTCP.h> #include <AsyncTCP.h>
#ifndef WS_MAX_QUEUED_MESSAGES
#define WS_MAX_QUEUED_MESSAGES 32 #define WS_MAX_QUEUED_MESSAGES 32
#endif
#else #else
#include <ESPAsyncTCP.h> #include <ESPAsyncTCP.h>
#ifndef WS_MAX_QUEUED_MESSAGES
#define WS_MAX_QUEUED_MESSAGES 8 #define WS_MAX_QUEUED_MESSAGES 8
#endif #endif
#endif
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include "AsyncWebSynchronization.h" #include "AsyncWebSynchronization.h"
@ -44,7 +40,7 @@
#endif #endif
#endif #endif
#if defined(ESP32) || defined(LIBRETINY) #if defined(ESP32) || defined(LIBRETUYA)
#define DEFAULT_MAX_WS_CLIENTS 8 #define DEFAULT_MAX_WS_CLIENTS 8
#else #else
#define DEFAULT_MAX_WS_CLIENTS 4 #define DEFAULT_MAX_WS_CLIENTS 4

2
src/AsyncWebSynchronization.h
View File

@ -5,7 +5,7 @@
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#if defined(ESP32) || (defined(LIBRETINY) && LT_HAS_FREERTOS) #if defined(ESP32) || (defined(LIBRETUYA) && LT_HAS_FREERTOS)
// This is the ESP32 version of the Sync Lock, using the FreeRTOS Semaphore // This is the ESP32 version of the Sync Lock, using the FreeRTOS Semaphore
class AsyncWebLock class AsyncWebLock

2
src/ESPAsyncWebServer.h
View File

@ -28,7 +28,7 @@
#include "StringArray.h" #include "StringArray.h"
#if defined(ESP32) || defined(LIBRETINY) #if defined(ESP32) || defined(LIBRETUYA)
#include <WiFi.h> #include <WiFi.h>
#include <AsyncTCP.h> #include <AsyncTCP.h>
#elif defined(ESP8266) #elif defined(ESP8266)

11
src/WebRequest.cpp
View File

@ -180,17 +180,12 @@ void AsyncWebServerRequest::_onData(void *buf, size_t len){
void AsyncWebServerRequest::_removeNotInterestingHeaders(){ void AsyncWebServerRequest::_removeNotInterestingHeaders(){
if (_interestingHeaders.containsIgnoreCase("ANY")) return; // nothing to do if (_interestingHeaders.containsIgnoreCase("ANY")) return; // nothing to do
for(const auto& header: _headers){
auto itr = _headers.begin(); if(!_interestingHeaders.containsIgnoreCase(header->name().c_str())){
while (itr != _headers.end())
{
const auto header = *itr;
++itr; // ++operator before remove(), otherwise itr becomes invalid
if (!_interestingHeaders.containsIgnoreCase(header->name().c_str()))
_headers.remove(header); _headers.remove(header);
} }
} }
}
void AsyncWebServerRequest::_onPoll(){ void AsyncWebServerRequest::_onPoll(){
//os_printf("p\n"); //os_printf("p\n");