diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-05-18 20:48:42 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-05-18 20:48:42 +0200 |
| commit | d4e000906ac4ef243258a5c9a819a7cde247d16a (patch) | |
| tree | bdc44f2764908f6457bb68bfeea33b56c5eb4219 | |
| parent | bb7ff942d378538f37465873657ea5153914fab6 (diff) | |
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
| -rw-r--r-- | lib/gtls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gtls.c b/lib/gtls.c index 32d81d46b..bb2ee1068 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); |