decode header value with utf-8

src/main.rs

@@ -19,7 +19,7 @@ mod vendored;
 use std::env;
 use std::fs::File;
 use std::io::{self, IsTerminal, Read};
-use std::net::{IpAddr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 use std::path::PathBuf;
 use std::process;
 use std::str::FromStr;
@@ -265,23 +265,19 @@ fn run(args: Cli) -> Result<i32> {
         }?);
     }
 
-    if matches!(
-        args.http_version,
-        Some(HttpVersion::Http10) | Some(HttpVersion::Http11)
-    ) {
-        client = client.http1_only();
-    }
-
-    if matches!(args.http_version, Some(HttpVersion::Http2PriorKnowledge)) {
-        client = client.http2_prior_knowledge();
-    }
+    client = match args.http_version {
+        Some(HttpVersion::Http10 | HttpVersion::Http11) => client.http1_only(),
+        Some(HttpVersion::Http2PriorKnowledge) => client.http2_prior_knowledge(),
+        Some(HttpVersion::Http2) => client,
+        None => client,
+    };
 
     let cookie_jar = Arc::new(reqwest_cookie_store::CookieStoreMutex::default());
     client = client.cookie_provider(cookie_jar.clone());
 
     client = match (args.ipv4, args.ipv6) {
-        (true, false) => client.local_address(IpAddr::from_str("0.0.0.0")?),
-        (false, true) => client.local_address(IpAddr::from_str("::")?),
+        (true, false) => client.local_address(IpAddr::from(Ipv4Addr::UNSPECIFIED)),
+        (false, true) => client.local_address(IpAddr::from(Ipv6Addr::UNSPECIFIED)),
         _ => client,
     };
 

src/printer.rs

@@ -336,8 +336,8 @@ impl Printer {
                 header_string.push_str(key.as_str());
             }
             header_string.push_str(": ");
-            match value.to_str() {
-                Ok(value) => header_string.push_str(value),
+            match String::from_utf8(value.as_bytes().to_vec()) {
+                Ok(value) => header_string.push_str(&value),
                 #[allow(clippy::format_push_string)]
                 Err(_) => header_string.push_str(&format!("{:?}", value)),
             }

src/redirect.rs

@@ -51,8 +51,8 @@ fn get_next_request(mut request: Request, response: &Response) -> Option<Request
         response
             .headers()
             .get(LOCATION)
-            .and_then(|location| location.to_str().ok())
-            .and_then(|location| request.url().join(location).ok())
+            .and_then(|location| String::from_utf8(location.as_bytes().to_vec()).ok())
+            .and_then(|location| request.url().join(&location).ok())
     };
 
     match response.status() {

src/to_curl.rs

@@ -308,7 +308,11 @@ pub fn translate(args: Cli) -> Result<Command> {
         if value.is_empty() {
             cmd.arg(format!("{};", header));
         } else {
-            cmd.arg(format!("{}: {}", header, value.to_str()?));
+            cmd.arg(format!(
+                "{}: {}",
+                header,
+                String::from_utf8(value.as_bytes().to_vec())?
+            ));
         }
     }
     for header in headers_to_unset {