Merge pull request #532 from ecnelises/8_4_0

Update to curl 8.4.0
alexcrichton · Oct 11, 2023 · de57280 · de57280
2 parents 4f10982 + 6b7e62b
commit de57280
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.67+curl-8.3.0"
+version = "0.4.68+curl-8.4.0"
 authors = ["Alex Crichton <[email protected]>"]
 links = "curl"
 build = "build.rs"

diff --git a/curl-sys/build.rs b/curl-sys/build.rs
@@ -100,7 +100,7 @@ fn main() {
             .replace("@LIBCURL_LIBS@", "")
             .replace("@SUPPORT_FEATURES@", "")
             .replace("@SUPPORT_PROTOCOLS@", "")
-            .replace("@CURLVERSION@", "8.3.0"),
+            .replace("@CURLVERSION@", "8.4.0"),
     )
     .unwrap();
 

diff --git a/curl-sys/curl b/curl-sys/curl
diff --git a/tests/multi.rs b/tests/multi.rs
@@ -140,7 +140,6 @@ fn upload_lots() {
 
     let e = t!(m.add(h));
 
-    assert!(t!(m.perform()) > 0);
     let mut next_token = 1;
     let mut token_map = HashMap::new();
     let mut cur_timeout = None;

diff --git a/tests/post.rs b/tests/post.rs
@@ -1,3 +1,4 @@
+use curl::Version;
 use std::time::Duration;
 
 macro_rules! t {
@@ -23,23 +24,35 @@ fn handle() -> Easy {
     e
 }
 
+fn multipart_boundary_size() -> usize {
+    // Versions before 8.4.0 used a smaller multipart mime boundary, so the
+    // exact content-length will differ between versions.
+    if Version::get().version_num() >= 0x80400 {
+        148
+    } else {
+        136
+    }
+}
+
 #[test]
 fn custom() {
+    multipart_boundary_size();
     let s = Server::new();
-    s.receive(
+    s.receive(&format!(
         "\
          POST / HTTP/1.1\r\n\
          Host: 127.0.0.1:$PORT\r\n\
          Accept: */*\r\n\
-         Content-Length: 142\r\n\
+         Content-Length: {}\r\n\
          Content-Type: multipart/form-data; boundary=--[..]\r\n\
          \r\n\
          --[..]\r\n\
          Content-Disposition: form-data; name=\"foo\"\r\n\
          \r\n\
          1234\r\n\
          --[..]\r\n",
-    );
+        multipart_boundary_size() + 6
+    ));
     s.send("HTTP/1.1 200 OK\r\n\r\n");
 
     let mut handle = handle();
@@ -50,15 +63,16 @@ fn custom() {
     t!(handle.perform());
 }
 
+#[cfg(feature = "static-curl")]
 #[test]
 fn buffer() {
     let s = Server::new();
-    s.receive(
+    s.receive(&format!(
         "\
          POST / HTTP/1.1\r\n\
          Host: 127.0.0.1:$PORT\r\n\
          Accept: */*\r\n\
-         Content-Length: 181\r\n\
+         Content-Length: {}\r\n\
          Content-Type: multipart/form-data; boundary=--[..]\r\n\
          \r\n\
          --[..]\r\n\
@@ -67,7 +81,8 @@ fn buffer() {
          \r\n\
          1234\r\n\
          --[..]\r\n",
-    );
+        multipart_boundary_size() + 45
+    ));
     s.send("HTTP/1.1 200 OK\r\n\r\n");
 
     let mut handle = handle();
@@ -82,6 +97,7 @@ fn buffer() {
     t!(handle.perform());
 }
 
+#[cfg(feature = "static-curl")]
 #[test]
 fn file() {
     let s = Server::new();
@@ -102,7 +118,7 @@ fn file() {
              {}\
              \r\n\
              --[..]\r\n",
-            199 + formdata.len(),
+            multipart_boundary_size() + 63 + formdata.len(),
             formdata
         )
         .as_str(),