Commit d4e00090 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

GnuTLS handshake: fix timeout 

Commit cbf4961b garbled the timeout handling while doing SSL
handshaking (in an attempt at fixing another bug). This puts sanity
back.

Bug: http://curl.haxx.se/mail/lib-2011-05/0167.html
Reported by: Ethan Glasser Camp
parent bb7ff942

lib/gtls.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ static CURLcode handshake(struct connectdata *conn, 
        connssl->connecting_state?sockfd:CURL_SOCKET_BAD;



      what = Curl_socket_ready(readfd, writefd,

                               nonblocking?0:(int)timeout_ms?1000:timeout_ms);

                               nonblocking?0:

                               ((int)timeout_ms?timeout_ms:1000));

      if(what < 0) {

        /* fatal error */

        failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);