Update HTTPUpdate.cpp (espressif#4942)

DTTerastar · web-flow · commit 63c51d51fb58 · 2021-03-16T02:14:53.000+02:00
This is a mirror of a change in esp8266 needed to update with a url that redirects.
diff --git a/libraries/HTTPUpdate/src/HTTPUpdate.cpp b/libraries/HTTPUpdate/src/HTTPUpdate.cpp
@@ -35,11 +35,13 @@
 HTTPUpdate::HTTPUpdate(void)
         : _httpClientTimeout(8000), _ledPin(-1)
 {
+    _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
 }
 
 HTTPUpdate::HTTPUpdate(int httpClientTimeout)
         : _httpClientTimeout(httpClientTimeout), _ledPin(-1)
 {
+    _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
 }
 
 HTTPUpdate::~HTTPUpdate(void)
@@ -175,6 +177,7 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
     // use HTTP/1.0 for update since the update handler not support any transfer Encoding
     http.useHTTP10(true);
     http.setTimeout(_httpClientTimeout);
+    http.setFollowRedirects(_followRedirects);
     http.setUserAgent("ESP32-http-Update");
     http.addHeader("Cache-Control", "no-cache");
     http.addHeader("x-ESP32-STA-MAC", WiFi.macAddress());
diff --git a/libraries/HTTPUpdate/src/HTTPUpdate.h b/libraries/HTTPUpdate/src/HTTPUpdate.h
@@ -63,6 +63,15 @@ class HTTPUpdate
     {
         _rebootOnUpdate = reboot;
     }
+    
+    /**
+      * set redirect follow mode. See `followRedirects_t` enum for avaliable modes.
+      * @param follow
+      */
+    void setFollowRedirects(followRedirects_t follow)
+    {
+        _followRedirects = follow;
+    }
 
     void setLedPin(int ledPin = -1, uint8_t ledOn = HIGH)
     {
@@ -89,6 +98,7 @@ class HTTPUpdate
     bool _rebootOnUpdate = true;
 private:
     int _httpClientTimeout;
+    followRedirects_t _followRedirects;
 
     int _ledPin;
     uint8_t _ledOn;

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,13 @@`
`35`	`35`	`HTTPUpdate::HTTPUpdate(void)`
`36`	`36`	`: _httpClientTimeout(8000), _ledPin(-1)`
`37`	`37`	`{`
	`38`	`+ _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`HTTPUpdate::HTTPUpdate(int httpClientTimeout)`
`41`	`42`	`: _httpClientTimeout(httpClientTimeout), _ledPin(-1)`
`42`	`43`	`{`
	`44`	`+ _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`HTTPUpdate::~HTTPUpdate(void)`
`@@ -175,6 +177,7 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren`
`175`	`177`	`// use HTTP/1.0 for update since the update handler not support any transfer Encoding`
`176`	`178`	`http.useHTTP10(true);`
`177`	`179`	`http.setTimeout(_httpClientTimeout);`
	`180`	`+ http.setFollowRedirects(_followRedirects);`
`178`	`181`	`http.setUserAgent("ESP32-http-Update");`
`179`	`182`	`http.addHeader("Cache-Control", "no-cache");`
`180`	`183`	`http.addHeader("x-ESP32-STA-MAC", WiFi.macAddress());`