mirror of
https://github.com/curl/curl.git
synced 2026-08-25 03:23:32 +03:00
ssl: fix duplicated SSL handshake with multi interface and proxy
Bug: https://bugzilla.redhat.com/788526 Reported by: Enrico Scholz
This commit is contained in:
parent
dd576194ce
commit
68857e40d6
2 changed files with 7 additions and 6 deletions
10
lib/sslgen.c
10
lib/sslgen.c
|
|
@ -211,18 +211,18 @@ CURLcode
|
|||
Curl_ssl_connect_nonblocking(struct connectdata *conn, int sockindex,
|
||||
bool *done)
|
||||
{
|
||||
#ifdef curlssl_connect_nonblocking
|
||||
CURLcode res;
|
||||
/* mark this is being ssl requested from here on. */
|
||||
conn->ssl[sockindex].use = TRUE;
|
||||
#ifdef curlssl_connect_nonblocking
|
||||
res = curlssl_connect_nonblocking(conn, sockindex, done);
|
||||
#else
|
||||
*done = TRUE; /* fallback to BLOCKING */
|
||||
res = curlssl_connect(conn, sockindex);
|
||||
#endif /* non-blocking connect support */
|
||||
if(!res && *done)
|
||||
Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */
|
||||
return res;
|
||||
#else
|
||||
*done = TRUE; /* fallback to BLOCKING */
|
||||
return Curl_ssl_connect(conn, sockindex);
|
||||
#endif /* non-blocking connect support */
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue