add http client configurable timeout usefull when download is slow on…

… server side (esp8266#4705) * add http client configurable timeout usefull when download is slow from server side * member init outside constructor body. * removed this.
r3wald · May 4, 2018 · bd87970 · bd87970
1 parent 76a14b1
commit bd87970
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/libraries/ESP8266httpUpdate/library.properties b/libraries/ESP8266httpUpdate/library.properties
@@ -1,5 +1,5 @@
 name=ESP8266httpUpdate
-version=1.1
+version=1.2
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=Http Update for ESP8266

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -30,6 +30,12 @@ extern "C" uint32_t _SPIFFS_start;
 extern "C" uint32_t _SPIFFS_end;
 
 ESP8266HTTPUpdate::ESP8266HTTPUpdate(void)
+        : _httpClientTimeout(8000)
+{
+}
+
+ESP8266HTTPUpdate::ESP8266HTTPUpdate(int httpClientTimeout)
+        : _httpClientTimeout(httpClientTimeout)
 {
 }
 
@@ -170,7 +176,7 @@ HTTPUpdateResult ESP8266HTTPUpdate::handleUpdate(HTTPClient& http, const String&
 
     // use HTTP/1.0 for update since the update handler not support any transfer Encoding
     http.useHTTP10(true);
-    http.setTimeout(8000);
+    http.setTimeout(_httpClientTimeout);
     http.setUserAgent(F("ESP8266-http-Update"));
     http.addHeader(F("x-ESP8266-STA-MAC"), WiFi.macAddress());
     http.addHeader(F("x-ESP8266-AP-MAC"), WiFi.softAPmacAddress());

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
@@ -64,6 +64,7 @@ class ESP8266HTTPUpdate
 {
 public:
     ESP8266HTTPUpdate(void);
+    ESP8266HTTPUpdate(int httpClientTimeout);
     ~ESP8266HTTPUpdate(void);
 
     void rebootOnUpdate(bool reboot)
@@ -103,6 +104,8 @@ class ESP8266HTTPUpdate
 
     int _lastError;
     bool _rebootOnUpdate = true;
+private:
+    int _httpClientTimeout;
 };
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_HTTPUPDATE)