Skip to content

Commit

Permalink
Fix compile with Arduino lib builder (#6244)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason2866 authored Feb 7, 2022
1 parent 4cbb738 commit c4954dd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions libraries/HTTPClient/src/HTTPClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,7 @@ void HTTPClient::setCookie(String date, String headerValue)
for (auto c = _cookieJar->begin(); c != _cookieJar->end(); ++c) {
if (c->domain == cookie.domain && c->name == cookie.name) {
// when evaluating, max-age takes precedence over expires if both are defined
if (cookie.max_age.valid && ((cookie.date + cookie.max_age.duration) < now_gmt || cookie.max_age.duration <= 0)
if ((cookie.max_age.valid && ((cookie.date + cookie.max_age.duration) < now_gmt)) || cookie.max_age.duration <= 0
|| (!cookie.max_age.valid && cookie.expires.valid && cookie.expires.date < now_gmt)) {
_cookieJar->erase(c);
c--;
Expand All @@ -1671,7 +1671,7 @@ bool HTTPClient::generateCookieString(String *cookieString)
bool found = false;

for (auto c = _cookieJar->begin(); c != _cookieJar->end(); ++c) {
if (c->max_age.valid && ((c->date + c->max_age.duration) < now_gmt) || (!c->max_age.valid && c->expires.valid && c->expires.date < now_gmt)) {
if ((c->max_age.valid && ((c->date + c->max_age.duration) < now_gmt)) || (!c->max_age.valid && c->expires.valid && c->expires.date < now_gmt)) {
_cookieJar->erase(c);
c--;
} else if (_host.indexOf(c->domain) >= 0 && (!c->secure || _secure) ) {
Expand All @@ -1684,5 +1684,3 @@ bool HTTPClient::generateCookieString(String *cookieString)
}
return found;
}


0 comments on commit c4954dd

Please sign in to comment.