Commit 92a537a2 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 7ed689d2

lib/pop3.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -1355,14 +1355,6 @@ static CURLcode pop3_connect(struct connectdata *conn, bool *done) 
  pp->endofresp = pop3_endofresp;

  pp->endofresp = pop3_endofresp;

  pp->conn = conn;

  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 */

  /* Initialise the pingpong layer */

  Curl_pp_init(pp);

  Curl_pp_init(pp);