Update to curl 7.66.0

Author: alexcrichton

curl-sys/curl

@@ -798,7 +798,8 @@ pub const CURLVERSION_SECOND: CURLversion = 1;
 pub const CURLVERSION_THIRD: CURLversion = 2;
 pub const CURLVERSION_FOURTH: CURLversion = 3;
 pub const CURLVERSION_FIFTH: CURLversion = 4;
-pub const CURLVERSION_NOW: CURLversion = CURLVERSION_FIFTH;
+pub const CURLVERSION_SIXTH: CURLversion = 5;
+pub const CURLVERSION_NOW: CURLversion = CURLVERSION_SIXTH;
 
 #[repr(C)]
 pub struct curl_version_info_data {
@@ -818,6 +819,9 @@ pub struct curl_version_info_data {
     pub libssh_version: *const c_char,
     pub brotli_ver_num: c_uint,
     pub brotli_version: *const c_char,
+    pub nghttp2_ver_num: c_uint,
+    pub nghttp2_version: *const c_char,
+    pub quic_version: *const c_char,
 }
 
 pub const CURL_VERSION_IPV6: c_int = 1 << 0;

curl-sys/lib.rs

@@ -32,7 +32,7 @@ impl Version {
     /// Returns the libcurl version that this library is currently linked against.
     pub fn get() -> Version {
         unsafe {
-            let ptr = curl_sys::curl_version_info(curl_sys::CURLVERSION_FOURTH);
+            let ptr = curl_sys::curl_version_info(curl_sys::CURLVERSION_NOW);
             assert!(!ptr.is_null());
             Version { inner: ptr }
         }
@@ -245,6 +245,39 @@ impl Version {
             }
         }
     }
+
+    /// If available, the version of nghttp2 libcurl is linked against.
+    pub fn nghttp2_version_num(&self) -> Option<u32> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SIXTH {
+                Some((*self.inner).nghttp2_ver_num)
+            } else {
+                None
+            }
+        }
+    }
+
+    /// If available, the version of nghttp2 libcurl is linked against.
+    pub fn nghttp2_version(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SIXTH {
+                ::opt_str((*self.inner).nghttp2_version)
+            } else {
+                None
+            }
+        }
+    }
+
+    /// If available, the version of quic libcurl is linked against.
+    pub fn quic_version(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SIXTH {
+                ::opt_str((*self.inner).quic_version)
+            } else {
+                None
+            }
+        }
+    }
 }
 
 impl fmt::Debug for Version {
@@ -286,6 +319,21 @@ impl fmt::Debug for Version {
         if let Some(s) = self.libssh_version() {
             f.field("libssh_version", &s);
         }
+        if let Some(s) = self.brotli_version_num() {
+            f.field("brotli_version_num", &format!("{:x}", s));
+        }
+        if let Some(s) = self.brotli_version() {
+            f.field("brotli_version", &s);
+        }
+        if let Some(s) = self.nghttp2_version_num() {
+            f.field("nghttp2_version_num", &format!("{:x}", s));
+        }
+        if let Some(s) = self.nghttp2_version() {
+            f.field("nghttp2_version", &s);
+        }
+        if let Some(s) = self.quic_version() {
+            f.field("quic_version", &s);
+        }
 
         f.field("protocols", &self.protocols().collect::<Vec<_>>());
 

src/version.rs

@@ -49,7 +49,7 @@ fn main() {
     cfg.skip_signededness(|s| s.ends_with("callback") || s.ends_with("function"));
 
     cfg.skip_struct(move |s| {
-        if version < 60 {
+        if version < 65 {
             match s {
                 "curl_version_info_data" => return true,
                 _ => {}
@@ -81,7 +81,7 @@ fn main() {
         }
         if version < 60 {
             match s {
-                "CURLVERSION_FIFTH" | "CURLVERSION_NOW" => return true,
+                "CURLVERSION_FIFTH" | "CURLVERSION_SIXTH" | "CURLVERSION_NOW" => return true,
                 _ => {}
             }
         }