Commit 68857e40 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

ssl: fix duplicated SSL handshake with multi interface and proxy 

Bug: https://bugzilla.redhat.com/788526
Reported by: Enrico Scholz
parent dd576194

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ This release includes the following bugfixes: 
 o cmdline: made -D option work with -O and -J

 o configure: Fix libcurl.pc and curl-config generation for static MingW*

   cross builds

 o ssl: fix duplicated SSL handshake with multi interface and proxy [1]



This release includes the following known bugs:
@@ -39,4 +40,4 @@ advice from friends like these: 


References to bug reports and discussions on issues:



 
 [1] = https://bugzilla.redhat.com/788526

lib/sslgen.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

  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);

  res = curlssl_connect(conn, sockindex);

#endif /* non-blocking connect support */

  if(!res && *done)

    Curl_pgrsTime(conn->data, TIMER_APPCONNECT); /* SSL is connected */

  return res;

}



/*