Exposed the CURLOPT_UPLOAD_BUFFERSIZE curl option. (#411)

* Exposed the CURLOPT_UPLOAD_BUFFERSIZE curl option.

See also: https://curl.se/libcurl/c/CURLOPT_UPLOAD_BUFFERSIZE.html

* [trivial] Fixed a typo.

* [trivial] Only test the upload_buffer_size(...) API if the system's libcurl is 7.62.0 or later.

* An attempt to fix CI by conditionally checking the constant CURLOPT_UPLOAD_BUFFERSIZE.

Co-authored-by: Andrey Petrov <[email protected]>

Author: darkprokoba

curl-sys/lib.rs

@@ -595,6 +595,8 @@ pub const CURLOPT_PROXY_CAPATH: CURLoption = CURLOPTTYPE_OBJECTPOINT + 247;
 pub const CURLOPT_PROXY_SSLCERT: CURLoption = CURLOPTTYPE_OBJECTPOINT + 254;
 pub const CURLOPT_PROXY_SSLKEY: CURLoption = CURLOPTTYPE_OBJECTPOINT + 256;
 
+pub const CURLOPT_UPLOAD_BUFFERSIZE: CURLoption = CURLOPTTYPE_LONG + 280;
+
 pub const CURLOPT_MAXAGE_CONN: CURLoption = CURLOPTTYPE_LONG + 288;
 
 pub const CURLOPT_SSLCERT_BLOB: CURLoption = CURLOPTTYPE_BLOB + 291;

src/easy/handle.rs

@@ -653,6 +653,11 @@ impl Easy {
         self.inner.buffer_size(size)
     }
 
+    /// Same as [`Easy2::upload_buffer_size`](struct.Easy2.html#method.upload_buffer_size)
+    pub fn upload_buffer_size(&mut self, size: usize) -> Result<(), Error> {
+        self.inner.upload_buffer_size(size)
+    }
+
     /// Same as [`Easy2::tcp_nodelay`](struct.Easy2.html#method.tcp_nodelay)
     pub fn tcp_nodelay(&mut self, enable: bool) -> Result<(), Error> {
         self.inner.tcp_nodelay(enable)

src/easy/handler.rs

@@ -1061,6 +1061,17 @@ impl<H> Easy2<H> {
         self.setopt_long(curl_sys::CURLOPT_BUFFERSIZE, size as c_long)
     }
 
+    /// Specify the preferred send buffer size, in bytes.
+    ///
+    /// This is treated as a request, not an order, and the main point of this
+    /// is that the read callback may get called more often with smaller
+    /// chunks.
+    ///
+    /// The upload buffer size is by default 64 kilobytes.
+    pub fn upload_buffer_size(&mut self, size: usize) -> Result<(), Error> {
+        self.setopt_long(curl_sys::CURLOPT_UPLOAD_BUFFERSIZE, size as c_long)
+    }
+
     // /// Enable or disable TCP Fast Open
     // ///
     // /// By default this options defaults to `false` and corresponds to

systest/build.rs

@@ -136,6 +136,12 @@ fn main() {
                 _ => {}
             }
         }
+        if version < 62 {
+            match s {
+                "CURLOPT_UPLOAD_BUFFERSIZE" => return true,
+                _ => {}
+            }
+        }
         if version < 61 {
             match s {
                 "CURLOPT_PIPEWAIT" => return true,

tests/easy.rs

@@ -14,6 +14,7 @@ macro_rules! t {
 }
 
 use curl::easy::{Easy, List, ReadError, Transfer, WriteError};
+use curl::Version;
 
 use crate::server::Server;
 mod server;
@@ -300,6 +301,12 @@ fn misc() {
     // t!(h.tcp_keepidle(Duration::new(3, 0)));
     // t!(h.tcp_keepintvl(Duration::new(3, 0)));
     t!(h.buffer_size(10));
+
+    if Version::get().version_num() >= 0x073e00 {
+        // only available on curl 7.62.0 or later:
+        t!(h.upload_buffer_size(10));
+    }
+
     t!(h.dns_cache_timeout(Duration::new(1, 0)));
 }