Commit 379d63ec authored by Steve Holme's avatar Steve Holme
Browse files

imap.c: Fixed failure detection during TLS upgrade 

imap_state_upgrade_tls() would attempt to incorrectly complete the
upgrade to imaps and start the CAPABILITY command if
Curl_ssl_connect_nonblocking() returned a failure code and if ssldone
was set to TRUE. This would only happen when a non-blocking API hadn't
been provided by the SSL implementation and curlssl_connect() was
called underneath.
parent b1826d81

lib/imap.c

+9 −6
Original line number Diff line number Diff line
@@ -627,10 +627,8 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn, 
    else

      result = imap_state_capability(conn);

  }

  else {

    state(conn, IMAP_UPGRADETLS);

  else

    result = imap_state_upgrade_tls(conn);

  }



  return result;

}
@@ -642,10 +640,15 @@ static CURLcode imap_state_upgrade_tls(struct connectdata *conn) 


  result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone);



  if(!result) {

    if(imapc->state != IMAP_UPGRADETLS)

      state(conn, IMAP_UPGRADETLS);



    if(imapc->ssldone) {

      imap_to_imaps(conn);

      result = imap_state_capability(conn);

    }

  }



  return result;

}