Abort update if http.begin() returns false. Fix a typo in httpUpdate.ino (espressif#2156)

Jeroen88 · me-no-dev · commit 0596a2ac86f5 · 2018-12-06T18:50:53.000+01:00
diff --git a/libraries/HTTPUpdate/examples/httpUpdate/httpUpdate.ino b/libraries/HTTPUpdate/examples/httpUpdate/httpUpdate.ino
@@ -56,7 +56,7 @@ void loop() {
 
     switch (ret) {
       case HTTP_UPDATE_FAILED:
-        Serial.printf("HTTP_UPDATE_FAILD Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
+        Serial.printf("HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
         break;
 
       case HTTP_UPDATE_NO_UPDATES:
diff --git a/libraries/HTTPUpdate/src/HTTPUpdate.cpp b/libraries/HTTPUpdate/src/HTTPUpdate.cpp
@@ -49,22 +49,31 @@ HTTPUpdate::~HTTPUpdate(void)
 HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion)
 {
     HTTPClient http;
-    http.begin(client, url);
+    if(!http.begin(client, url))
+    {
+        return HTTP_UPDATE_FAILED;
+    }
     return handleUpdate(http, currentVersion, false);
 }
 
 HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion)
 {
     HTTPClient http;
-    http.begin(client, url);
+    if(!http.begin(client, url))
+    {
+        return HTTP_UPDATE_FAILED;
+    }
     return handleUpdate(http, currentVersion, true);
 }
 
 HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint16_t port, const String& uri,
         const String& currentVersion)
 {
     HTTPClient http;
-    http.begin(client, host, port, uri);
+    if(!http.begin(client, host, port, uri))
+    {
+        return HTTP_UPDATE_FAILED;
+    }
     return handleUpdate(http, currentVersion, false);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,22 +49,31 @@ HTTPUpdate::~HTTPUpdate(void)`
`49`	`49`	`HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& url, const String& currentVersion)`
`50`	`50`	`{`
`51`	`51`	`HTTPClient http;`
`52`		`- http.begin(client, url);`
	`52`	`+ if(!http.begin(client, url))`
	`53`	`+ {`
	`54`	`+ return HTTP_UPDATE_FAILED;`
	`55`	`+ }`
`53`	`56`	`return handleUpdate(http, currentVersion, false);`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`HTTPUpdateResult HTTPUpdate::updateSpiffs(WiFiClient& client, const String& url, const String& currentVersion)`
`57`	`60`	`{`
`58`	`61`	`HTTPClient http;`
`59`		`- http.begin(client, url);`
	`62`	`+ if(!http.begin(client, url))`
	`63`	`+ {`
	`64`	`+ return HTTP_UPDATE_FAILED;`
	`65`	`+ }`
`60`	`66`	`return handleUpdate(http, currentVersion, true);`
`61`	`67`	`}`
`62`	`68`
`63`	`69`	`HTTPUpdateResult HTTPUpdate::update(WiFiClient& client, const String& host, uint16_t port, const String& uri,`
`64`	`70`	`const String& currentVersion)`
`65`	`71`	`{`
`66`	`72`	`HTTPClient http;`
`67`		`- http.begin(client, host, port, uri);`
	`73`	`+ if(!http.begin(client, host, port, uri))`
	`74`	`+ {`
	`75`	`+ return HTTP_UPDATE_FAILED;`
	`76`	`+ }`
`68`	`77`	`return handleUpdate(http, currentVersion, false);`
`69`	`78`	`}`
`70`	`79`