aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-02-14 18:20:52 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-02-14 18:20:52 +0000
commit92a537a2bb05e719eec1db49d6822a07a0da7f08 (patch)
tree48c74677ec8fd296fb55c014653ebc65ea9bd2c3
parent7ed689d24a4e32cc2536e1863b34fd6d58b0d00e (diff)
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.
-rw-r--r--lib/pop3.c8
1 files changed, 0 insertions, 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);