arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Expose post args during upload (#4935)

Browse Source 
Currently post args are only available at the end of upload but they are already listed - this PR just expose them with minimal changes
It also set a define for post args array size originaly set to 32
This commit is contained in:
Luc 2018-11-29 22:52:55 +01:00 committed by Earle F. Philhower, III
parent 9ec03ed3f6
commit 440a3aae7f
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View File

@ -53,6 +53,8 @@ ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
, _lastHandler(nullptr) , _lastHandler(nullptr)
, _currentArgCount(0) , _currentArgCount(0)
, _currentArgs(nullptr) , _currentArgs(nullptr)
, _postArgsLen(0)
, _postArgs(nullptr)
, _headerKeysCount(0) , _headerKeysCount(0)
, _currentHeaders(nullptr) , _currentHeaders(nullptr)
, _contentLength(0) , _contentLength(0)
@ -71,6 +73,8 @@ ESP8266WebServer::ESP8266WebServer(int port)
, _lastHandler(nullptr) , _lastHandler(nullptr)
, _currentArgCount(0) , _currentArgCount(0)
, _currentArgs(nullptr) , _currentArgs(nullptr)
, _postArgsLen(0)
, _postArgs(nullptr)
, _headerKeysCount(0) , _headerKeysCount(0)
, _currentHeaders(nullptr) , _currentHeaders(nullptr)
, _contentLength(0) , _contentLength(0)
@ -486,6 +490,10 @@ void ESP8266WebServer::_streamFileCore(const size_t fileSize, const String & fil
const String& ESP8266WebServer::arg(String name) const { const String& ESP8266WebServer::arg(String name) const {
for (int j = 0; j < _postArgsLen; ++j) {
if ( _postArgs[j].key == name )
return _postArgs[j].value;
}
for (int i = 0; i < _currentArgCount; ++i) { for (int i = 0; i < _currentArgCount; ++i) {
if ( _currentArgs[i].key == name ) if ( _currentArgs[i].key == name )
return _currentArgs[i].value; return _currentArgs[i].value;
@ -510,6 +518,10 @@ int ESP8266WebServer::args() const {
} }
bool ESP8266WebServer::hasArg(const String& name) const { bool ESP8266WebServer::hasArg(const String& name) const {
for (int j = 0; j < _postArgsLen; ++j) {
if (_postArgs[j].key == name)
return true;
}
for (int i = 0; i < _currentArgCount; ++i) { for (int i = 0; i < _currentArgCount; ++i) {
if (_currentArgs[i].key == name) if (_currentArgs[i].key == name)
return true; return true;

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

@ -180,9 +180,12 @@ protected:
int _currentArgCount; int _currentArgCount;
RequestArgument* _currentArgs; RequestArgument* _currentArgs;
std::unique_ptr<HTTPUpload> _currentUpload; std::unique_ptr<HTTPUpload> _currentUpload;
int _postArgsLen;
RequestArgument* _postArgs;
int _headerKeysCount; int _headerKeysCount;
RequestArgument* _currentHeaders; RequestArgument* _currentHeaders;
size_t _contentLength; size_t _contentLength;
String _responseHeaders; String _responseHeaders;

30
libraries/ESP8266WebServer/src/Parsing.cpp
View File

@ -32,6 +32,10 @@
#define DEBUG_OUTPUT Serial #define DEBUG_OUTPUT Serial
#endif #endif
#ifndef WEBSERVER_MAX_POST_ARGS
#define WEBSERVER_MAX_POST_ARGS 32
#endif
static const char Content_Type[] PROGMEM = "Content-Type"; static const char Content_Type[] PROGMEM = "Content-Type";
static const char filename[] PROGMEM = "filename"; static const char filename[] PROGMEM = "filename";
@ -383,8 +387,9 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, const String& boundary, ui
client.readStringUntil('\n'); client.readStringUntil('\n');
//start reading the form //start reading the form
if (line == ("--"+boundary)){ if (line == ("--"+boundary)){
RequestArgument* postArgs = new RequestArgument[32]; if(_postArgs) delete[] _postArgs;
int postArgsLen = 0; _postArgs = new RequestArgument[WEBSERVER_MAX_POST_ARGS];
_postArgsLen = 0;
while(1){ while(1){
String argName; String argName;
String argValue; String argValue;
@ -445,7 +450,7 @@ bool ESP8266WebServer::_parseForm(WiFiClient& client, const String& boundary, ui
DEBUG_OUTPUT.println(); DEBUG_OUTPUT.println();
#endif #endif
RequestArgument& arg = postArgs[postArgsLen++]; RequestArgument& arg = _postArgs[_postArgsLen++];
arg.key = argName; arg.key = argName;
arg.value = argValue; arg.value = argValue;
@ -552,22 +557,25 @@ readfile:
} }
int iarg; int iarg;
int totalArgs = ((32 - postArgsLen) < _currentArgCount)?(32 - postArgsLen):_currentArgCount; int totalArgs = ((WEBSERVER_MAX_POST_ARGS - _postArgsLen) < _currentArgCount)?(WEBSERVER_MAX_POST_ARGS - _postArgsLen):_currentArgCount;
for (iarg = 0; iarg < totalArgs; iarg++){ for (iarg = 0; iarg < totalArgs; iarg++){
RequestArgument& arg = postArgs[postArgsLen++]; RequestArgument& arg = _postArgs[_postArgsLen++];
arg.key = _currentArgs[iarg].key; arg.key = _currentArgs[iarg].key;
arg.value = _currentArgs[iarg].value; arg.value = _currentArgs[iarg].value;
} }
if (_currentArgs) delete[] _currentArgs; if (_currentArgs) delete[] _currentArgs;
_currentArgs = new RequestArgument[postArgsLen]; _currentArgs = new RequestArgument[_postArgsLen];
for (iarg = 0; iarg < postArgsLen; iarg++){ for (iarg = 0; iarg < _postArgsLen; iarg++){
RequestArgument& arg = _currentArgs[iarg]; RequestArgument& arg = _currentArgs[iarg];
arg.key = postArgs[iarg].key; arg.key = _postArgs[iarg].key;
arg.value = postArgs[iarg].value; arg.value = _postArgs[iarg].value;
} }
_currentArgCount = iarg; _currentArgCount = iarg;
if (postArgs) if (_postArgs) {
delete[] postArgs; delete[] _postArgs;
_postArgs = nullptr;
_postArgsLen = 0;
}
return true; return true;
} }
#ifdef DEBUG_ESP_HTTP_SERVER #ifdef DEBUG_ESP_HTTP_SERVER