From db59b6202d8eb15b8c2cb41a52d0675832182976 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 17 Mar 2011 23:07:56 +0100
Subject: [PATCH] [pop3 starttls] PASS command was not sent after upgrade to
 TLS.

---
 lib/pop3.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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