romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-25 06:27:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_writeout: get certinfo only when needing it

Browse source 
Removes a fairly expensive libcurl call when not necessary

Closes #13914
This commit is contained in:
Daniel Stenberg 2024-06-10 13:57:01 +02:00
parent 4464c9f2c6
commit 0a3c78f6b6
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tool_writeout.c
View file

@ -268,6 +268,15 @@ static int urlpart(struct per_transfer *per, writeoutid vid,
return rc;
}
static void certinfo(struct per_transfer *per)
{
if(!per->certinfo) {
struct curl_certinfo *certinfo;
CURLcode res = curl_easy_getinfo(per->curl, CURLINFO_CERTINFO, &certinfo);
per->certinfo = (!res && certinfo) ? certinfo : NULL;
}
}
static int writeString(FILE *stream, const struct writeoutvar *wovar,
struct per_transfer *per, CURLcode per_result,
bool use_json)
@ -303,6 +312,7 @@ static int writeString(FILE *stream, const struct writeoutvar *wovar,
else {
switch(wovar->id) {
case VAR_CERT:
certinfo(per);
if(per->certinfo) {
int i;
bool error = FALSE;
@ -434,6 +444,7 @@ static int writeLong(FILE *stream, const struct writeoutvar *wovar,
else {
switch(wovar->id) {
case VAR_NUM_CERTS:
certinfo(per);
longinfo = per->certinfo ? per->certinfo->num_of_certs : 0;
valid = true;
break;
@ -526,17 +537,12 @@ void ourWriteOut(struct OperationConfig *config, struct per_transfer *per,
const char *writeinfo = config->writeout;
const char *ptr = writeinfo;
bool done = FALSE;
struct curl_certinfo *certinfo;
CURLcode res = curl_easy_getinfo(per->curl, CURLINFO_CERTINFO, &certinfo);
bool fclose_stream = FALSE;
struct dynbuf name;
if(!writeinfo)
return;
if(!res && certinfo)
per->certinfo = certinfo;
curlx_dyn_init(&name, MAX_WRITEOUT_NAME_LENGTH);
while(ptr && *ptr && !done) {
if('%' == *ptr && ptr[1]) {