Skip to content

Commit dc20696

Browse files
author
Jeroen88
committed
Adding #pragma's to ESP8266httpUpdate.cpp to ignore use of deprecated functions. Adaptations to work with new ESP8266hhtpClient are made in PR #4980
1 parent cfd977c commit dc20696

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

libraries/ESP8266HTTPClient/examples/DigestAuthorization/DigestAuthorization.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void loop() {
117117
String authorization = getDigestAuth(authReq, String(username), String(password), String(uri), 1);
118118

119119
http.end();
120-
http.begin(String(server) + String(uri));
120+
http.begin(client, String(server) + String(uri));
121121

122122
http.addHeader("Authorization", authorization);
123123

libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,44 +53,62 @@ HTTPUpdateResult ESP8266HTTPUpdate::update(const String& url, const String& curr
5353
HTTPUpdateResult ESP8266HTTPUpdate::update(const String& url, const String& currentVersion)
5454
{
5555
HTTPClient http;
56+
#pragma GCC diagnostic push
57+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
5658
http.begin(url);
59+
#pragma GCC diagnostic pop
5760
return handleUpdate(http, currentVersion, false);
5861
}
5962

6063
HTTPUpdateResult ESP8266HTTPUpdate::update(const String& url, const String& currentVersion,
6164
const String& httpsFingerprint)
6265
{
6366
HTTPClient http;
67+
#pragma GCC diagnostic push
68+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
6469
http.begin(url, httpsFingerprint);
70+
#pragma GCC diagnostic pop
6571
return handleUpdate(http, currentVersion, false);
6672
}
6773

6874
HTTPUpdateResult ESP8266HTTPUpdate::update(const String& url, const String& currentVersion,
6975
const uint8_t httpsFingerprint[20])
7076
{
7177
HTTPClient http;
78+
#pragma GCC diagnostic push
79+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
7280
http.begin(url, httpsFingerprint);
81+
#pragma GCC diagnostic pop
7382
return handleUpdate(http, currentVersion, false);
7483
}
7584

7685
HTTPUpdateResult ESP8266HTTPUpdate::updateSpiffs(const String& url, const String& currentVersion, const String& httpsFingerprint)
7786
{
7887
HTTPClient http;
88+
#pragma GCC diagnostic push
89+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
7990
http.begin(url, httpsFingerprint);
91+
#pragma GCC diagnostic pop
8092
return handleUpdate(http, currentVersion, true);
8193
}
8294

8395
HTTPUpdateResult ESP8266HTTPUpdate::updateSpiffs(const String& url, const String& currentVersion, const uint8_t httpsFingerprint[20])
8496
{
8597
HTTPClient http;
98+
#pragma GCC diagnostic push
99+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
86100
http.begin(url, httpsFingerprint);
101+
#pragma GCC diagnostic pop
87102
return handleUpdate(http, currentVersion, true);
88103
}
89104

90105
HTTPUpdateResult ESP8266HTTPUpdate::updateSpiffs(const String& url, const String& currentVersion)
91106
{
92107
HTTPClient http;
108+
#pragma GCC diagnostic push
109+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
93110
http.begin(url);
111+
#pragma GCC diagnostic pop
94112
return handleUpdate(http, currentVersion, true);
95113
}
96114

@@ -110,23 +128,32 @@ HTTPUpdateResult ESP8266HTTPUpdate::update(const String& host, uint16_t port, co
110128
const String& currentVersion)
111129
{
112130
HTTPClient http;
131+
#pragma GCC diagnostic push
132+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
113133
http.begin(host, port, uri);
134+
#pragma GCC diagnostic pop
114135
return handleUpdate(http, currentVersion, false);
115136
}
116137

117138
HTTPUpdateResult ESP8266HTTPUpdate::update(const String& host, uint16_t port, const String& url,
118139
const String& currentVersion, const String& httpsFingerprint)
119140
{
120141
HTTPClient http;
142+
#pragma GCC diagnostic push
143+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
121144
http.begin(host, port, url, httpsFingerprint);
145+
#pragma GCC diagnostic pop
122146
return handleUpdate(http, currentVersion, false);
123147
}
124148

125149
HTTPUpdateResult ESP8266HTTPUpdate::update(const String& host, uint16_t port, const String& url,
126150
const String& currentVersion, const uint8_t httpsFingerprint[20])
127151
{
128152
HTTPClient http;
153+
#pragma GCC diagnostic push
154+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
129155
http.begin(host, port, url, httpsFingerprint);
156+
#pragma GCC diagnostic pop
130157
return handleUpdate(http, currentVersion, false);
131158
}
132159

0 commit comments

Comments
 (0)