Fix raw requests with http/2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "x8"
-version = "2.3.1"
+version = "2.3.2"
 authors = ["Alexander Mironov <[email protected]>"]
 edition = "2018"
 license = "GPL-3.0-or-later"
@@ -14,7 +14,7 @@ readme = "README.md"
 [dependencies]
 tokio = { version = "1", features = ["full"] }
 futures = "0.3.15"
-reqwest = { version = "0.11", features = ["socks", "json", "cookies", "rustls-tls", "trust-dns"] }
+reqwest = { version = "0.11.2", features = ["socks", "json", "cookies", "rustls-tls", "trust-dns"] }
 regex = "1.3.7"
 percent-encoding = "2.1.0"
 lazy_static = "1.4.0"

src/utils.rs

@@ -291,7 +291,7 @@ pub fn parse_request(insecure: bool, request: &str, config: Config) -> Option<Co
     let proto = if insecure { "http://" } else { "https://" };
     let mut firstline = lines.next()?.split(' ');
     let method = firstline.next()?.to_string();
-    let path = firstline.next()?.to_string();
+    let mut path = firstline.next()?.to_string();
 
     let http2: bool = firstline.next()?.to_string().contains("HTTP/2");
 
@@ -315,7 +315,12 @@ pub fn parse_request(insecure: bool, request: &str, config: Config) -> Option<Co
 
         match key.to_lowercase().as_str() {
             "content-type" => content_type = value.clone(),
-            "host" => host = value.clone(),
+            "host" => {
+                host = value.clone();
+                if http2 {
+                    continue
+                }
+            },
             "content-length" => continue,
             _ => ()
         };
@@ -342,10 +347,13 @@ pub fn parse_request(insecure: bool, request: &str, config: Config) -> Option<Co
     };
 
     let mut url = [proto.to_string(), host.clone(), path.clone()].concat();
+    let initial_url = url.clone();
     if !config.as_body && url.contains('?') && url.contains('=') && !url.contains("%s") {
         url.push_str("&%s");
+        path.push_str("&%s");
     } else if !config.as_body {
         url.push_str("?%s");
+        path.push_str("?%s");
     }
 
     Some(Config {
@@ -358,6 +366,7 @@ pub fn parse_request(insecure: bool, request: &str, config: Config) -> Option<Co
         body_type,
         parameter_template,
         http2,
+        initial_url,
         ..config
     })
 }