Use CURLOPT_CONNECTTIMEOUT if timeout too big (#497)

If the time that was converted into millisecond
is more than the capacity of c_long, it will
overflow, thus we need to convert it into seconds
and use CURLOPT_CONNECTTIMEOUT.

Author: LorenzoLeonardo

src/easy/handler.rs

@@ -1,4 +1,5 @@
 use std::cell::RefCell;
+use std::convert::TryFrom;
 use std::ffi::{CStr, CString};
 use std::fmt;
 use std::io::{self, SeekFrom, Write};
@@ -2048,8 +2049,15 @@ impl<H> Easy2<H> {
     /// By default this value is 300 seconds and corresponds to
     /// `CURLOPT_CONNECTTIMEOUT_MS`.
     pub fn connect_timeout(&mut self, timeout: Duration) -> Result<(), Error> {
-        let ms = timeout.as_secs() * 1000 + timeout.subsec_millis() as u64;
-        self.setopt_long(curl_sys::CURLOPT_CONNECTTIMEOUT_MS, ms as c_long)
+        let ms = timeout.as_millis();
+        match c_long::try_from(ms) {
+            Ok(amt) => self.setopt_long(curl_sys::CURLOPT_CONNECTTIMEOUT_MS, amt),
+            Err(_) => {
+                let amt = c_long::try_from(ms / 1000)
+                    .map_err(|_| Error::new(curl_sys::CURLE_BAD_FUNCTION_ARGUMENT))?;
+                self.setopt_long(curl_sys::CURLOPT_CONNECTTIMEOUT, amt)
+            }
+        }
     }
 
     /// Specify which IP protocol version to use

tests/easy.rs

@@ -13,8 +13,8 @@ macro_rules! t {
     };
 }
 
-use curl::easy::{Easy, List, ReadError, Transfer, WriteError};
-use curl::Version;
+use curl::easy::{Easy, Easy2, List, ReadError, Transfer, WriteError};
+use curl::{Error, Version};
 
 use crate::server::Server;
 mod server;
@@ -970,3 +970,33 @@ fn path_as_is() {
     assert_eq!(t!(h.response_code()), 200);
     assert_eq!(t!(h.effective_url()), Some(&addr[..]));
 }
+
+#[test]
+fn test_connect_timeout() {
+    use curl::easy::Handler;
+    struct Collector(Vec<u8>);
+
+    impl Handler for Collector {
+        fn write(&mut self, data: &[u8]) -> Result<usize, WriteError> {
+            self.0.extend_from_slice(data);
+            Ok(data.len())
+        }
+    }
+    let mut easy2 = Easy2::new(Collector(Vec::new()));
+
+    // Overflow value test must return an Error
+    assert_eq!(
+        Error::new(curl_sys::CURLE_BAD_FUNCTION_ARGUMENT),
+        easy2
+            .connect_timeout(Duration::from_secs(std::u64::MAX))
+            .unwrap_err()
+    );
+
+    // Valid value
+    assert_eq!(
+        (),
+        easy2
+            .connect_timeout(Duration::from_millis(i32::MAX as u64))
+            .unwrap()
+    );
+}