Skip to content

Commit 64bf038

Browse files
committed
correction for compilation
1 parent 85d6349 commit 64bf038

10 files changed

Lines changed: 24 additions & 24 deletions

File tree

examples/platformio/CompileTest/platformio.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ platform_packages =
77
monitor_speed = 115200
88

99
lib_deps =
10-
https://github.com/playmiel/ESPAsyncWebClient.git
11-
10+
https://github.com/ESP32Async/AsyncTCP.git
11+
12+
lib_extra_dirs = ../../../
1213

1314
build_flags =
1415
-DCOMPILE_TEST_ONLY

examples/platformio/CustomHeaders/platformio.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ platform_packages =
77
monitor_speed = 115200
88

99
lib_deps =
10-
https://github.com/playmiel/ESPAsyncWebClient.git
10+
https://github.com/ESP32Async/AsyncTCP.git
11+
12+
lib_extra_dirs = ../../../

examples/platformio/MultipleRequests/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ platform_packages =
77
monitor_speed = 115200
88

99
lib_deps =
10-
https://github.com/playmiel/ESPAsyncWebClient.git
11-
10+
https://github.com/ESP32Async/AsyncTCP.git
1211

12+
lib_extra_dirs = ../../../

examples/platformio/PostWithData/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ platform_packages =
77
monitor_speed = 115200
88

99
lib_deps =
10-
https://github.com/playmiel/ESPAsyncWebClient.git
11-
10+
https://github.com/ESP32Async/AsyncTCP.git
1211

12+
lib_extra_dirs = ../../../

examples/platformio/SimpleGet/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ platform_packages =
77
monitor_speed = 115200
88

99
lib_deps =
10-
https://github.com/playmiel/ESPAsyncWebClient.git
11-
10+
https://github.com/ESP32Async/AsyncTCP.git
1211

12+
lib_extra_dirs = ../../../

examples/platformio/SimpleHttpsGet/platformio.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ monitor_speed = 115200
1010
build_flags = -DASYNC_HTTP_ENABLE_AUTOLOOP
1111

1212
lib_deps =
13-
https://github.com/playmiel/ESPAsyncWebClient.git
13+
https://github.com/ESP32Async/AsyncTCP.git
1414

15+
lib_extra_dirs = ../../../

platformio.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ platform = espressif32
1616
board = esp32dev
1717
framework = arduino
1818
platform_packages =
19-
framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/3.3.7/esp32-core-3.3.7.zip
19+
framework-arduinoespressif32@^3
2020
build_src_filter = -<*> +<../src/> +<../test/compile_test_internal/compile_test.cpp>
2121
; Run only Arduino-suitable tests on the device build
2222
test_filter = test_parse_url, test_chunk_parse, test_keep_alive, test_cookies, test_redirects
@@ -31,7 +31,7 @@ platform = espressif32
3131
board = esp32dev
3232
framework = arduino
3333
platform_packages =
34-
framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/3.3.7/esp32-core-3.3.7.zip
34+
framework-arduinoespressif32@^3
3535
build_flags =
3636
${env.build_flags}
3737
-DCOMPILE_TEST_ONLY
@@ -44,7 +44,7 @@ platform = espressif32
4444
board = esp32dev
4545
framework = arduino
4646
platform_packages =
47-
framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/3.3.7/esp32-core-3.3.7.zip
47+
framework-arduinoespressif32@^3
4848
build_flags =
4949
${env.build_flags}
5050
-DCOMPILE_TEST_ONLY
@@ -60,7 +60,7 @@ platform = espressif32
6060
board = esp32dev
6161
framework = arduino
6262
platform_packages =
63-
framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/3.3.7/esp32-core-3.3.7.zip
63+
framework-arduinoespressif32@^3
6464
build_flags =
6565
${env.build_flags}
6666
-DTEST_ASYNCTCP_DEV
@@ -75,7 +75,7 @@ platform = espressif32
7575
board = esp32dev
7676
framework = arduino
7777
platform_packages =
78-
framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/3.3.7/esp32-core-3.3.7.zip
78+
framework-arduinoespressif32@^3
7979
build_flags =
8080
${env.build_flags}
8181
-DTEST_ASYNCTCP_STABLE

src/AsyncHttpClient.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,9 @@ void AsyncHttpClient::cleanup(RequestContext* context) {
914914
if (_connectionPool) {
915915
recycle = _connectionPool->shouldRecycleTransport(
916916
context->request.get(), context->response, context->transport, context->responseProcessed,
917-
context->requestKeepAlive, context->serverRequestedClose, context->chunk.chunked, context->chunk.chunkedComplete,
918-
context->expectedContentLength, context->receivedContentLength, _keepAliveEnabled);
917+
context->requestKeepAlive, context->serverRequestedClose, context->chunk.chunked,
918+
context->chunk.chunkedComplete, context->expectedContentLength, context->receivedContentLength,
919+
_keepAliveEnabled);
919920
}
920921
if (recycle && _connectionPool) {
921922
_connectionPool->releaseConnectionToPool(context->transport, context->request.get(),
@@ -949,7 +950,6 @@ void AsyncHttpClient::triggerError(RequestContext* context, HttpClientError erro
949950
cleanup(context);
950951
}
951952

952-
953953
void AsyncHttpClient::loop() {
954954
uint32_t now = millis();
955955
if (_connectionPool)
@@ -1087,7 +1087,6 @@ AsyncHttpTLSConfig AsyncHttpClient::resolveTlsConfig(const AsyncHttpRequest* req
10871087
return cfg;
10881088
}
10891089

1090-
10911090
AsyncTransport* AsyncHttpClient::buildTransport(RequestContext* context) {
10921091
if (!context || !context->request)
10931092
return nullptr;

src/AsyncHttpClient.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ class AsyncHttpClient {
5555
uint32_t head(const char* url, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
5656
uint32_t patch(const char* url, const char* data, SuccessCallback onSuccess, ErrorCallback onError = nullptr);
5757

58-
5958
// Configuration methods
6059
void setHeader(const char* name, const char* value);
6160
void removeHeader(const char* name);

src/HttpHelpers.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ int64_t currentTimeSeconds() {
3737
}
3838

3939
int monthFromAbbrev(const char* mon) {
40-
static const char* kMonths[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
41-
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
40+
static const char* kMonths[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
4241
if (!mon || strlen(mon) < 3)
4342
return -1;
4443
for (int i = 0; i < 12; ++i) {
@@ -93,8 +92,7 @@ bool parseHttpDate(const String& value, int64_t* outEpoch) {
9392
int day = 0, year = 0, hour = 0, minute = 0, second = 0;
9493
char monthBuf[4] = {0};
9594
char tzBuf[4] = {0};
96-
int matched = sscanf(date.c_str(), "%d %3s %d %d:%d:%d %3s", &day, monthBuf, &year, &hour, &minute, &second,
97-
tzBuf);
95+
int matched = sscanf(date.c_str(), "%d %3s %d %d:%d:%d %3s", &day, monthBuf, &year, &hour, &minute, &second, tzBuf);
9896
if (matched < 6)
9997
return false;
10098
if (matched == 6)

0 commit comments

Comments
 (0)