diff options
author | Daniel Stenberg <daniel@haxx.se> | 2021-06-18 10:18:39 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-06-19 23:02:16 +0200 |
commit | a6da29686729eb50e92c14c9e74857526ebc3da5 (patch) | |
tree | 609380066aac7f25386d48418a925edd43fad777 /lib/smtp.c | |
parent | bfa03091752408c6b2db6657587aba04ff9b2874 (diff) | |
download | curl-a6da29686729eb50e92c14c9e74857526ebc3da5.tar.gz |
vtls: only store TIMER_APPCONNECT for non-proxy connect
Introducing a 'isproxy' argument to the connect function so that it
knows wether to store the time stamp or not.
Reported-by: Yongkang Huang
Fixes #7274
Closes #7274
Diffstat (limited to 'lib/smtp.c')
-rw-r--r-- | lib/smtp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index feffc05bc..17cdbbd4e 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -397,7 +397,8 @@ static CURLcode smtp_perform_upgrade_tls(struct Curl_easy *data) /* Start the SSL connection */ struct connectdata *conn = data->conn; struct smtp_conn *smtpc = &conn->proto.smtpc; - CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, + CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FALSE, + FIRSTSOCKET, &smtpc->ssldone); if(!result) { @@ -1258,7 +1259,7 @@ static CURLcode smtp_multi_statemach(struct Curl_easy *data, bool *done) struct smtp_conn *smtpc = &conn->proto.smtpc; if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) { - result = Curl_ssl_connect_nonblocking(data, conn, + result = Curl_ssl_connect_nonblocking(data, conn, FALSE, FIRSTSOCKET, &smtpc->ssldone); if(result || !smtpc->ssldone) return result; |