mirror of
https://github.com/curl/curl.git
synced 2024-11-27 05:50:21 +08:00
hsts: handle adding the same host name again
It will then use the largest expire time of the two entries.
This commit is contained in:
parent
0bf8b796a0
commit
ca02a77f05
13
lib/hsts.c
13
lib/hsts.c
@ -426,14 +426,23 @@ static CURLcode hsts_add(struct hsts *h, char *line)
|
|||||||
if(2 == rc) {
|
if(2 == rc) {
|
||||||
time_t expires = strcmp(date, UNLIMITED) ? Curl_getdate_capped(date) :
|
time_t expires = strcmp(date, UNLIMITED) ? Curl_getdate_capped(date) :
|
||||||
TIME_T_MAX;
|
TIME_T_MAX;
|
||||||
CURLcode result;
|
CURLcode result = CURLE_OK;
|
||||||
char *p = host;
|
char *p = host;
|
||||||
bool subdomain = FALSE;
|
bool subdomain = FALSE;
|
||||||
|
struct stsentry *e;
|
||||||
if(p[0] == '.') {
|
if(p[0] == '.') {
|
||||||
p++;
|
p++;
|
||||||
subdomain = TRUE;
|
subdomain = TRUE;
|
||||||
}
|
}
|
||||||
result = hsts_create(h, p, subdomain, expires);
|
/* only add it if not already present */
|
||||||
|
e = Curl_hsts(h, p, subdomain);
|
||||||
|
if(!e)
|
||||||
|
result = hsts_create(h, p, subdomain, expires);
|
||||||
|
else {
|
||||||
|
/* the same host name, use the largest expire time */
|
||||||
|
if(expires > e->expires)
|
||||||
|
e->expires = expires;
|
||||||
|
}
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user