diff options
Diffstat (limited to 'lib/vtls')
| -rw-r--r-- | lib/vtls/vtls.c | 6 | ||||
| -rw-r--r-- | lib/vtls/vtls.h | 4 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index 3d4a0229b..8a405c05c 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -248,7 +248,7 @@ Curl_ssl_connect(struct connectdata *conn, int sockindex)    conn->ssl[sockindex].use = TRUE;    conn->ssl[sockindex].state = ssl_connection_negotiating; -  result = Curl_ssl->connect(conn, sockindex); +  result = Curl_ssl->connect_blocking(conn, sockindex);    if(!result)      Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */ @@ -557,7 +557,7 @@ void Curl_ssl_close(struct connectdata *conn, int sockindex)  CURLcode Curl_ssl_shutdown(struct connectdata *conn, int sockindex)  { -  if(Curl_ssl->shutdown(conn, sockindex)) +  if(Curl_ssl->shut_down(conn, sockindex))      return CURLE_SSL_SHUTDOWN_FAILED;    conn->ssl[sockindex].use = FALSE; /* get back to ordinary socket usage */ @@ -1114,7 +1114,7 @@ static CURLcode Curl_multissl_connect(struct connectdata *conn, int sockindex)  {    if(multissl_init(NULL))      return CURLE_FAILED_INIT; -  return Curl_ssl->connect(conn, sockindex); +  return Curl_ssl->connect_blocking(conn, sockindex);  }  static CURLcode Curl_multissl_connect_nonblocking(struct connectdata *conn, diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index f1decbad6..2a87ca1f7 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -47,7 +47,7 @@ struct Curl_ssl {    size_t (*version)(char *buffer, size_t size);    int (*check_cxn)(struct connectdata *cxn); -  int (*shutdown)(struct connectdata *conn, int sockindex); +  int (*shut_down)(struct connectdata *conn, int sockindex);    bool (*data_pending)(const struct connectdata *conn,                         int connindex); @@ -56,7 +56,7 @@ struct Curl_ssl {                       size_t length);    bool (*cert_status_request)(void); -  CURLcode (*connect)(struct connectdata *conn, int sockindex); +  CURLcode (*connect_blocking)(struct connectdata *conn, int sockindex);    CURLcode (*connect_nonblocking)(struct connectdata *conn, int sockindex,                                    bool *done);    void *(*get_internals)(struct ssl_connect_data *connssl, CURLINFO info); | 
