aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2011-03-17 23:07:56 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-04-05 13:38:31 +0200
commitdb59b6202d8eb15b8c2cb41a52d0675832182976 (patch)
tree5caf8845c0a2cb03bd86323b389fc859b7bc889e /lib
parente7837bfd03c117aa8d4f0a1c5018e2d08119c4af (diff)
[pop3 starttls] PASS command was not sent after upgrade to TLS.
Diffstat (limited to 'lib')
-rw-r--r--lib/pop3.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pop3.c b/lib/pop3.c
index ba13e7d6b..79af8fc0c 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -298,6 +298,7 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
if(pop3code != 'O') {
failf(data, "STARTTLS denied. %c", pop3code);
result = CURLE_LOGIN_DENIED;
+ state(conn, POP3_STOP);
}
else {
/* Curl_ssl_connect is BLOCKING */
@@ -306,8 +307,10 @@ static CURLcode pop3_state_starttls_resp(struct connectdata *conn,
pop3_to_pop3s(conn);
result = pop3_state_user(conn);
}
+ else {
+ state(conn, POP3_STOP);
+ }
}
- state(conn, POP3_STOP);
return result;
}