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/pop3.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/pop3.c')
| -rw-r--r-- | lib/pop3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pop3.c b/lib/pop3.c index 9b6ea6480..8dc014b17 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -370,8 +370,9 @@ static CURLcode pop3_perform_upgrade_tls(struct Curl_easy *data, { /* Start the SSL connection */ struct pop3_conn *pop3c = &conn->proto.pop3c; - CURLcode result = Curl_ssl_connect_nonblocking(data, conn, FIRSTSOCKET, - &pop3c->ssldone); + CURLcode result = + Curl_ssl_connect_nonblocking(data, conn, FALSE, FIRSTSOCKET, + &pop3c->ssldone); if(!result) { if(pop3c->state != POP3_UPGRADETLS) @@ -1031,7 +1032,7 @@ static CURLcode pop3_multi_statemach(struct Curl_easy *data, bool *done) struct pop3_conn *pop3c = &conn->proto.pop3c; if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone) { - result = Curl_ssl_connect_nonblocking(data, conn, + result = Curl_ssl_connect_nonblocking(data, conn, FALSE, FIRSTSOCKET, &pop3c->ssldone); if(result || !pop3c->ssldone) return result; |