Bump to curl 8.17.0 (#629)

* Bump to curl 8.17.0

Been a bit since I've done this, but otherwise keeping things
up-to-date. Let's see how CI fares...

* Fix ntlm build

* Try to fix multi test

* Another attempted fix

Author: alexcrichton

curl-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "curl-sys"
-version = "0.4.83+curl-8.15.0"
+version = "0.4.84+curl-8.17.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 links = "curl"
 build = "build.rs"

curl-sys/build.rs

@@ -97,7 +97,7 @@ fn main() {
             .replace("@LIBCURL_LIBS@", "")
             .replace("@SUPPORT_FEATURES@", "")
             .replace("@SUPPORT_PROTOCOLS@", "")
-            .replace("@CURLVERSION@", "8.15.0"),
+            .replace("@CURLVERSION@", "8.17.0"),
     )
     .unwrap();
 
@@ -135,6 +135,7 @@ fn main() {
         .file("curl/lib/cf-h1-proxy.c")
         .file("curl/lib/cf-haproxy.c")
         .file("curl/lib/cf-https-connect.c")
+        .file("curl/lib/cf-ip-happy.c")
         .file("curl/lib/cf-socket.c")
         .file("curl/lib/cfilters.c")
         .file("curl/lib/conncache.c")
@@ -143,6 +144,7 @@ fn main() {
         .file("curl/lib/cookie.c")
         .file("curl/lib/cshutdn.c")
         .file("curl/lib/curl_addrinfo.c")
+        .file("curl/lib/curl_fopen.c")
         .file("curl/lib/curl_get_line.c")
         .file("curl/lib/curl_memrchr.c")
         .file("curl/lib/curl_range.c")
@@ -151,9 +153,11 @@ fn main() {
         .file("curl/lib/curl_trc.c")
         .file("curl/lib/curlx/base64.c")
         .file("curl/lib/curlx/dynbuf.c")
+        .file("curl/lib/curlx/fopen.c")
         .file("curl/lib/curlx/inet_ntop.c")
         .file("curl/lib/curlx/inet_pton.c")
         .file("curl/lib/curlx/nonblock.c")
+        .file("curl/lib/curlx/strerr.c")
         .file("curl/lib/curlx/strparse.c")
         .file("curl/lib/curlx/timediff.c")
         .file("curl/lib/curlx/timeval.c")
@@ -167,7 +171,6 @@ fn main() {
         .file("curl/lib/escape.c")
         .file("curl/lib/file.c")
         .file("curl/lib/fileinfo.c")
-        .file("curl/lib/fopen.c")
         .file("curl/lib/formdata.c")
         .file("curl/lib/getenv.c")
         .file("curl/lib/getinfo.c")
@@ -193,6 +196,7 @@ fn main() {
         .file("curl/lib/mqtt.c")
         .file("curl/lib/multi.c")
         .file("curl/lib/multi_ev.c")
+        .file("curl/lib/multi_ntfy.c")
         .file("curl/lib/netrc.c")
         .file("curl/lib/noproxy.c")
         .file("curl/lib/parsedate.c")
@@ -224,7 +228,6 @@ fn main() {
         .file("curl/lib/vauth/digest.c")
         .file("curl/lib/vauth/vauth.c")
         .file("curl/lib/version.c")
-        .file("curl/lib/vquic/curl_msh3.c")
         .file("curl/lib/vquic/curl_ngtcp2.c")
         .file("curl/lib/vquic/curl_osslq.c")
         .file("curl/lib/vquic/curl_quiche.c")
@@ -241,8 +244,7 @@ fn main() {
         .warnings(false);
 
     if cfg!(feature = "ntlm") {
-        cfg.file("curl/lib/curl_des.c")
-            .file("curl/lib/curl_endian.c")
+        cfg.file("curl/lib/curl_endian.c")
             .file("curl/lib/curl_gethostname.c")
             .file("curl/lib/curl_ntlm_core.c")
             .file("curl/lib/http_ntlm.c")

curl-sys/curl

@@ -160,7 +160,13 @@ fn upload_lots() {
                     Ok(Message::Wait(socket, events, token)) => {
                         let evented = mio::unix::EventedFd(&socket);
                         if events.remove() {
+                            println!("REMOVE: {socket} / {token} / {events:?}");
                             token_map.remove(&token).unwrap();
+                            // Looks like older curl might close the fd before
+                            // sending this event, while newer curl sends this
+                            // event before closing the fd. Ignore the error for
+                            // now.
+                            let _ = poll.deregister(&evented);
                         } else {
                             let mut e = mio::Ready::empty();
                             if events.input() {
@@ -171,6 +177,7 @@ fn upload_lots() {
                             }
                             if token == 0 {
                                 let token = next_token;
+                                println!("ADD: {socket} / {token} / {e:?}");
                                 next_token += 1;
                                 t!(m.assign(socket, token));
                                 token_map.insert(token, socket);
@@ -181,6 +188,7 @@ fn upload_lots() {
                                     mio::PollOpt::level()
                                 ));
                             } else {
+                                println!("ADJUST: {socket} / {token} / {e:?}");
                                 t!(poll.reregister(
                                     &evented,
                                     mio::Token(token),