romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 15:53:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

hsts: CURLSTS_FAIL from hsts read callback should fail transfer

Browse source 
... and have CURLE_ABORTED_BY_CALLBACK returned.

Extended test 1915 to verify.

Reported-by: Jonathan Cardoso
Fixes #7726
Closes #7729
This commit is contained in:
Daniel Stenberg 2021-09-16 08:40:21 +02:00
parent 5b7aaefc07
commit da2598f823
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
6 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/hsts.c
View file

@ -466,7 +466,7 @@ static CURLcode hsts_pull(struct Curl_easy *data, struct hsts *h)
return result;
}
else if(sc == CURLSTS_FAIL)
return CURLE_BAD_FUNCTION_ARGUMENT;
return CURLE_ABORTED_BY_CALLBACK;
} while(sc == CURLSTS_OK);
}
return CURLE_OK;

2
lib/hsts.h
View file

@ -59,7 +59,7 @@ CURLcode Curl_hsts_loadcb(struct Curl_easy *data,
struct hsts *h);
#else
#define Curl_hsts_cleanup(x)
#define Curl_hsts_loadcb(x,y)
#define Curl_hsts_loadcb(x,y) CURLE_OK
#define Curl_hsts_save(x,y,z)
#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_HSTS */
#endif /* HEADER_CURL_HSTS_H */

2
lib/transfer.c
View file

@ -1503,7 +1503,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
}
#endif
Curl_http2_init_state(&data->state);
Curl_hsts_loadcb(data, data->hsts);
result = Curl_hsts_loadcb(data, data->hsts);
}
/*