generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

protocol handler cleanup: SSL awareness

Browse Source 
As a follow-up to commit 8831000bc0: don't assume that the SSL powered
protocol alternatives are available.
This commit is contained in:
Daniel Stenberg
2011-03-15 10:02:05 +01:00
parent 211504ba8a
commit cc228ea6f6
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/imap.c
View File

@@ -334,6 +334,15 @@ static CURLcode imap_state_login(struct connectdata *conn)
return CURLE_OK;
}
#ifdef USE_SSL
static void imap_to_imaps(struct connectdata *conn)
{
conn->handler = &Curl_handler_imaps;
}
#else
#define imap_to_imaps(x)
#endif
/* for STARTTLS responses */
static CURLcode imap_state_starttls_resp(struct connectdata *conn,
int imapcode,
@@ -355,7 +364,7 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn,
else {
result = Curl_ssl_connect(conn, FIRSTSOCKET);
if(CURLE_OK == result) {
conn->handler = &Curl_handler_imaps;
imap_to_imaps(conn);
result = imap_state_login(conn);
}
}
@@ -372,7 +381,7 @@ static CURLcode imap_state_upgrade_tls(struct connectdata *conn)
result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone);
if(imapc->ssldone) {
conn->handler = &Curl_handler_imaps;
imap_to_imaps(conn);
result = imap_state_login(conn);
state(conn, IMAP_STOP);
}