Skip to content

Commit 0c8809e

Browse files
LeeLeahy2LeeLeahy2
committed
Merge branch 'master' into 10318-dev
2 parents e4fb0bd + 9e60bbe commit 0c8809e

File tree

4 files changed

+33
-32
lines changed

4 files changed

+33
-32
lines changed

Diff for: ‎idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ dependencies:
6868
rules:
6969
- if: "target != esp32c2"
7070
espressif/rmaker_common:
71-
version: "^1.4.3"
71+
version: "^1.4.6"
7272
rules:
7373
- if: "target != esp32c2"
7474
espressif/esp_insights:

Diff for: ‎libraries/WebServer/src/Parsing.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ bool WebServer::_collectHeader(const char *headerName, const char *headerValue)
280280
return false;
281281
}
282282

283-
void WebServer::_parseArguments(String data) {
283+
void WebServer::_parseArguments(const String &data) {
284284
log_v("args: %s", data.c_str());
285285
if (_currentArgs) {
286286
delete[] _currentArgs;
@@ -387,7 +387,7 @@ int WebServer::_uploadReadByte(NetworkClient &client) {
387387
return res;
388388
}
389389

390-
bool WebServer::_parseForm(NetworkClient &client, String boundary, uint32_t len) {
390+
bool WebServer::_parseForm(NetworkClient &client, const String &boundary, uint32_t len) {
391391
(void)len;
392392
log_v("Parse Form: Boundary: %s Length: %d", boundary.c_str(), len);
393393
String line;

Diff for: ‎libraries/WebServer/src/WebServer.cpp

+13-12
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ bool WebServer::authenticate(THandlerFunctionAuthCheck fn) {
268268
String *ret = fn(OTHER_AUTH, authReq, {});
269269
if (ret) {
270270
log_v("Authentication Success");
271+
delete ret;
271272
return true;
272273
}
273274
}
@@ -673,14 +674,14 @@ void WebServer::_streamFileCore(const size_t fileSize, const String &fileName, c
673674
send(code, contentType, "");
674675
}
675676

676-
String WebServer::pathArg(unsigned int i) {
677+
String WebServer::pathArg(unsigned int i) const {
677678
if (_currentHandler != nullptr) {
678679
return _currentHandler->pathArg(i);
679680
}
680681
return "";
681682
}
682683

683-
String WebServer::arg(String name) {
684+
String WebServer::arg(const String &name) const {
684685
for (int j = 0; j < _postArgsLen; ++j) {
685686
if (_postArgs[j].key == name) {
686687
return _postArgs[j].value;
@@ -694,25 +695,25 @@ String WebServer::arg(String name) {
694695
return "";
695696
}
696697

697-
String WebServer::arg(int i) {
698+
String WebServer::arg(int i) const {
698699
if (i < _currentArgCount) {
699700
return _currentArgs[i].value;
700701
}
701702
return "";
702703
}
703704

704-
String WebServer::argName(int i) {
705+
String WebServer::argName(int i) const {
705706
if (i < _currentArgCount) {
706707
return _currentArgs[i].key;
707708
}
708709
return "";
709710
}
710711

711-
int WebServer::args() {
712+
int WebServer::args() const {
712713
return _currentArgCount;
713714
}
714715

715-
bool WebServer::hasArg(String name) {
716+
bool WebServer::hasArg(const String &name) const {
716717
for (int j = 0; j < _postArgsLen; ++j) {
717718
if (_postArgs[j].key == name) {
718719
return true;
@@ -726,7 +727,7 @@ bool WebServer::hasArg(String name) {
726727
return false;
727728
}
728729

729-
String WebServer::header(String name) {
730+
String WebServer::header(const String &name) const {
730731
for (int i = 0; i < _headerKeysCount; ++i) {
731732
if (_currentHeaders[i].key.equalsIgnoreCase(name)) {
732733
return _currentHeaders[i].value;
@@ -748,25 +749,25 @@ void WebServer::collectHeaders(const char *headerKeys[], const size_t headerKeys
748749
}
749750
}
750751

751-
String WebServer::header(int i) {
752+
String WebServer::header(int i) const {
752753
if (i < _headerKeysCount) {
753754
return _currentHeaders[i].value;
754755
}
755756
return "";
756757
}
757758

758-
String WebServer::headerName(int i) {
759+
String WebServer::headerName(int i) const {
759760
if (i < _headerKeysCount) {
760761
return _currentHeaders[i].key;
761762
}
762763
return "";
763764
}
764765

765-
int WebServer::headers() {
766+
int WebServer::headers() const {
766767
return _headerKeysCount;
767768
}
768769

769-
bool WebServer::hasHeader(String name) {
770+
bool WebServer::hasHeader(const String &name) const {
770771
for (int i = 0; i < _headerKeysCount; ++i) {
771772
if ((_currentHeaders[i].key.equalsIgnoreCase(name)) && (_currentHeaders[i].value.length() > 0)) {
772773
return true;
@@ -775,7 +776,7 @@ bool WebServer::hasHeader(String name) {
775776
return false;
776777
}
777778

778-
String WebServer::hostHeader() {
779+
String WebServer::hostHeader() const {
779780
return _hostHeader;
780781
}
781782

Diff for: ‎libraries/WebServer/src/WebServer.h

+17-17
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ class WebServer {
158158
void onNotFound(THandlerFunction fn); //called when handler is not assigned
159159
void onFileUpload(THandlerFunction ufn); //handle file uploads
160160

161-
String uri() {
161+
String uri() const {
162162
return _currentUri;
163163
}
164-
HTTPMethod method() {
164+
HTTPMethod method() const {
165165
return _currentMethod;
166166
}
167167
virtual NetworkClient &client() {
@@ -174,24 +174,24 @@ class WebServer {
174174
return *_currentRaw;
175175
}
176176

177-
String pathArg(unsigned int i); // get request path argument by number
178-
String arg(String name); // get request argument value by name
179-
String arg(int i); // get request argument value by number
180-
String argName(int i); // get request argument name by number
181-
int args(); // get arguments count
182-
bool hasArg(String name); // check if argument exists
177+
String pathArg(unsigned int i) const; // get request path argument by number
178+
String arg(const String &name) const; // get request argument value by name
179+
String arg(int i) const; // get request argument value by number
180+
String argName(int i) const; // get request argument name by number
181+
int args() const; // get arguments count
182+
bool hasArg(const String &name) const; // check if argument exists
183183
void collectHeaders(const char *headerKeys[], const size_t headerKeysCount); // set the request headers to collect
184-
String header(String name); // get request header value by name
185-
String header(int i); // get request header value by number
186-
String headerName(int i); // get request header name by number
187-
int headers(); // get header count
188-
bool hasHeader(String name); // check if header exists
184+
String header(const String &name) const; // get request header value by name
185+
String header(int i) const; // get request header value by number
186+
String headerName(int i) const; // get request header name by number
187+
int headers() const; // get header count
188+
bool hasHeader(const String &name) const; // check if header exists
189189

190-
int clientContentLength() {
190+
int clientContentLength() const {
191191
return _clientContentLength;
192192
} // return "content-length" of incoming HTTP header from "_currentClient"
193193

194-
String hostHeader(); // get request host header if available or empty String if not
194+
String hostHeader() const; // get request host header if available or empty String if not
195195

196196
// send response to the client
197197
// code - HTTP response code, can be 200 or 404
@@ -240,9 +240,9 @@ class WebServer {
240240
void _handleRequest();
241241
void _finalizeResponse();
242242
bool _parseRequest(NetworkClient &client);
243-
void _parseArguments(String data);
243+
void _parseArguments(const String &data);
244244
static String _responseCodeToString(int code);
245-
bool _parseForm(NetworkClient &client, String boundary, uint32_t len);
245+
bool _parseForm(NetworkClient &client, const String &boundary, uint32_t len);
246246
bool _parseFormUploadAborted();
247247
void _uploadWriteByte(uint8_t b);
248248
int _uploadReadByte(NetworkClient &client);

0 commit comments

Comments
 (0)