Update curl submodule

Closes #210

Author: alexcrichton

curl-sys/curl

@@ -813,7 +813,8 @@ pub const CURLVERSION_FIRST: CURLversion = 0;
 pub const CURLVERSION_SECOND: CURLversion = 1;
 pub const CURLVERSION_THIRD: CURLversion = 2;
 pub const CURLVERSION_FOURTH: CURLversion = 3;
-pub const CURLVERSION_NOW: CURLversion = CURLVERSION_FOURTH;
+pub const CURLVERSION_FIFTH: CURLversion = 4;
+pub const CURLVERSION_NOW: CURLversion = CURLVERSION_FIFTH;
 
 #[repr(C)]
 pub struct curl_version_info_data {
@@ -831,6 +832,8 @@ pub struct curl_version_info_data {
     pub libidn: *const c_char,
     pub iconv_ver_num: c_int,
     pub libssh_version: *const c_char,
+    pub brotli_ver_num: c_uint,
+    pub brotli_version: *const c_char,
 }
 
 pub const CURL_VERSION_IPV6: c_int = 1 << 0;

curl-sys/lib.rs

@@ -180,7 +180,7 @@ impl Version {
     /// against.
     pub fn ares_version(&self) -> Option<&str> {
         unsafe {
-            if (*self.inner).age >= 1 {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SECOND {
                 ::opt_str((*self.inner).ares)
             } else {
                 None
@@ -191,7 +191,7 @@ impl Version {
     /// If available, the version of ares that libcurl is linked against.
     pub fn ares_version_num(&self) -> Option<u32> {
         unsafe {
-            if (*self.inner).age >= 1 {
+            if (*self.inner).age >= curl_sys::CURLVERSION_SECOND {
                 Some((*self.inner).ares_num as u32)
             } else {
                 None
@@ -202,7 +202,7 @@ impl Version {
     /// If available, the version of libidn that libcurl is linked against.
     pub fn libidn_version(&self) -> Option<&str> {
         unsafe {
-            if (*self.inner).age >= 2 {
+            if (*self.inner).age >= curl_sys::CURLVERSION_THIRD {
                 ::opt_str((*self.inner).libidn)
             } else {
                 None
@@ -213,7 +213,7 @@ impl Version {
     /// If available, the version of iconv libcurl is linked against.
     pub fn iconv_version_num(&self) -> Option<u32> {
         unsafe {
-            if (*self.inner).age >= 3 {
+            if (*self.inner).age >= curl_sys::CURLVERSION_FOURTH {
                 Some((*self.inner).iconv_ver_num as u32)
             } else {
                 None
@@ -224,13 +224,35 @@ impl Version {
     /// If available, the version of iconv libcurl is linked against.
     pub fn libssh_version(&self) -> Option<&str> {
         unsafe {
-            if (*self.inner).age >= 3 {
+            if (*self.inner).age >= curl_sys::CURLVERSION_FOURTH {
                 ::opt_str((*self.inner).libssh_version)
             } else {
                 None
             }
         }
     }
+
+    /// If available, the version of brotli libcurl is linked against.
+    pub fn brotli_version_num(&self) -> Option<u32> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_FIFTH {
+                Some((*self.inner).brotli_ver_num)
+            } else {
+                None
+            }
+        }
+    }
+
+    /// If available, the version of brotli libcurl is linked against.
+    pub fn brotli_version(&self) -> Option<&str> {
+        unsafe {
+            if (*self.inner).age >= curl_sys::CURLVERSION_FIFTH {
+                ::opt_str((*self.inner).brotli_version)
+            } else {
+                None
+            }
+        }
+    }
 }
 
 impl fmt::Debug for Version {

src/version.rs

@@ -29,7 +29,6 @@ POST / HTTP/1.1\r\n\
 Host: 127.0.0.1:$PORT\r\n\
 Accept: */*\r\n\
 Content-Length: 142\r\n\
-Expect: 100-continue\r\n\
 Content-Type: multipart/form-data; boundary=--[..]\r\n\
 \r\n\
 --[..]\r\n\
@@ -55,7 +54,6 @@ POST / HTTP/1.1\r\n\
 Host: 127.0.0.1:$PORT\r\n\
 Accept: */*\r\n\
 Content-Length: 181\r\n\
-Expect: 100-continue\r\n\
 Content-Type: multipart/form-data; boundary=--[..]\r\n\
 \r\n\
 --[..]\r\n\
@@ -86,7 +84,6 @@ POST / HTTP/1.1\r\n\
 Host: 127.0.0.1:$PORT\r\n\
 Accept: */*\r\n\
 Content-Length: {}\r\n\
-Expect: 100-continue\r\n\
 Content-Type: multipart/form-data; boundary=--[..]\r\n\
 \r\n\
 --[..]\r\n\