From bc81bd41ac467056340723d061fd37a81d78e1a0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Apr 2024 09:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E5=AD=98=E5=9C=A8BUG=20git=20commit?= =?UTF-8?q?=20-m=20=E2=80=9C=E5=AD=98=E5=9C=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArduinoHttpClient/src/HttpClient.cpp | 7 ++++--- src/main.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.pio/libdeps/esp32-s3-devkitc-1/ArduinoHttpClient/src/HttpClient.cpp b/.pio/libdeps/esp32-s3-devkitc-1/ArduinoHttpClient/src/HttpClient.cpp index 7517eea..3aa4e25 100644 --- a/.pio/libdeps/esp32-s3-devkitc-1/ArduinoHttpClient/src/HttpClient.cpp +++ b/.pio/libdeps/esp32-s3-devkitc-1/ArduinoHttpClient/src/HttpClient.cpp @@ -4,7 +4,6 @@ #include "HttpClient.h" #include "b64.h" - // Initialize constants const char* HttpClient::kUserAgent = "Arduino/2.2.0"; const char* HttpClient::kContentLengthPrefix = HTTP_HEADER_CONTENT_LENGTH ": "; @@ -687,13 +686,13 @@ bool HttpClient::headerAvailable() { // clear the currently store header line iHeaderLine = ""; - + int i = 0; while (!endOfHeadersReached()) { // read a byte from the header int c = readHeader(); - if (c == '\r' || c == '\n') + if (c == '\r' || c == '\n'||c==-1) { if (iHeaderLine.length()) { @@ -709,6 +708,8 @@ bool HttpClient::headerAvailable() // append byte to header line iHeaderLine += (char)c; + i++; + if(i>20000) return true; } return (iHeaderLine.length() > 0); diff --git a/src/main.cpp b/src/main.cpp index 0bc7c3a..dd70459 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -61,13 +61,18 @@ String getnetData() int times_try = 0; while (http->headerAvailable()) { - if(times_try > 1000) + + if(times_try > 100) { write_log(log_path,100,"http->headerAvailable failed ..."); return "-1"; } + write_log(log_path,100,"http->readHeaderName"); String headerName = http->readHeaderName(); + write_log(log_path,100,"http->readHeaderValue"); String headerValue = http->readHeaderValue(); + write_log(log_path,100,String(times_try)+"http->headerName "+headerName); + write_log(log_path,100,String(times_try)+"http->headerValue "+headerValue); // SerialMon.println("Date: " + headerName + " : " + headerValue); vTaskDelay(100); times_try++; @@ -242,7 +247,6 @@ void Reuploaddata() //重新上传数据 ReuploadData("/down", "/weather/php/SpectralDataUp.php"); ReuploadData("/up", "/weather/php/SpectralDataUp.php"); ReuploadData("/other", "/weather/php/WindsensorUp.php", "application/json"); - } String Datenow="";