From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 18 May 2011 18:48:42 +0000 (+0200)
Subject: GnuTLS handshake: fix timeout
X-Git-Tag: curl-7_21_7~111
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4e000906ac4ef243258a5c9a819a7cde247d16a;p=thirdparty%2Fcurl.git

GnuTLS handshake: fix timeout

Commit cbf4961bf3e 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
---

diff --git a/lib/gtls.c b/lib/gtls.c
index 32d81d46bf..bb2ee10689 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -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);