diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-04-10 21:49:55 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-04-10 21:49:55 +0000 |
| commit | 676597e9618970e7e2dfdfe440b09c3aee625576 (patch) | |
| tree | e5e89e55e67b6d82590d90a85a931c42bbe6ff74 /lib | |
| parent | 686d90745be4417127050ad4b36d0a5403def200 (diff) | |
Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and
CURLOPT_TIMEOUT, the _longer_ time would wrongly be used for the SSL
connection time-out!
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssluse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssluse.c b/lib/ssluse.c index 60d174fd1..4a67b1124 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -1332,7 +1332,7 @@ Curl_ossl_connect_step2(struct connectdata *conn, /* get the most strict timeout of the ones converted to milliseconds */ if(data->set.timeout && - (data->set.timeout>data->set.connecttimeout)) + (data->set.timeout<data->set.connecttimeout)) *timeout_ms = data->set.timeout*1000; else *timeout_ms = data->set.connecttimeout*1000; |