From 92a537a2bb05e719eec1db49d6822a07a0da7f08 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 14 Feb 2013 18:20:52 +0000
Subject: [PATCH] pop3: Fixed blocking SSL connect when connecting via POP3S

A call to Curl_ssl_connect() was accidentally left in when the SSL/TLS
connection layer was reworked in 7.29. Not only would this cause the
connection to block but had the additional overhead of calling the
non-blocking connect a little bit later.
---
 lib/pop3.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/pop3.c b/lib/pop3.c
index 9c57f269b..ffbb5156f 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1355,14 +1355,6 @@ static CURLcode pop3_connect(struct connectdata *conn, bool *done)
   pp->endofresp = pop3_endofresp;
   pp->conn = conn;
 
-  if(conn->handler->flags & PROTOPT_SSL) {
-    /* POP3S is simply POP3 with SSL for the control channel */
-    /* so perform the SSL initialization for this socket */
-    result = Curl_ssl_connect(conn, FIRSTSOCKET);
-    if(result)
-      return result;
-  }
-
   /* Initialise the pingpong layer */
   Curl_pp_init(pp);