3 files changed, 41 insertions, 21 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 26d886375d4..3044526c1c9 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -177,7 +177,7 @@ pub fn set_default_accept_language(headers: &mut HeaderMap) {
     // TODO(eijebong): Change this once typed headers are done
     headers.insert(
         header::ACCEPT_LANGUAGE,
-        HeaderValue::from_static("en-US, en; q=0.5"),
+        HeaderValue::from_static("en-US,en;q=0.5"),
     );
 }
 
@@ -1225,7 +1225,20 @@ async fn http_network_or_cache_fetch(
 
     // Step 5.16
     let current_url = http_request.current_url();
-    http_request.headers.remove(header::HOST);
+    if !http_request.headers.contains_key(header::HOST) {
+        let host = if current_url.port().is_none() {
+            current_url.host_str().unwrap().to_string()
+        } else {
+            format!(
+                "{}:{}",
+                current_url.host_str().unwrap(),
+                current_url.port().unwrap()
+            )
+        };
+        http_request.headers.typed_insert(headers::Host::from(
+            host.parse::<http::uri::Authority>().unwrap(),
+        ));
+    }
 
     // unlike http_loader, we should not set the accept header
     // here, according to the fetch spec
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index c4409e7d6d5..7b9a140bcb4 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -1350,20 +1350,29 @@ fn test_fetch_with_devtools() {
     //Creating default headers for request
     let mut headers = HeaderMap::new();
 
-    headers.insert(
-        header::ACCEPT_ENCODING,
-        HeaderValue::from_static("gzip, deflate, br"),
-    );
-
     headers.insert(header::ACCEPT, HeaderValue::from_static("*/*"));
 
     headers.insert(
         header::ACCEPT_LANGUAGE,
-        HeaderValue::from_static("en-US, en; q=0.5"),
+        HeaderValue::from_static("en-US,en;q=0.5"),
     );
 
     headers.typed_insert::<UserAgent>(DEFAULT_USER_AGENT.parse().unwrap());
 
+    let host = if url.port().is_none() {
+        url.host_str().unwrap().to_string()
+    } else {
+        format!("{}:{}", url.host_str().unwrap(), url.port().unwrap())
+    };
+    headers.typed_insert(headers::Host::from(
+        host.parse::<http::uri::Authority>().unwrap(),
+    ));
+
+    headers.insert(
+        header::ACCEPT_ENCODING,
+        HeaderValue::from_static("gzip, deflate, br"),
+    );
+
     let httprequest = DevtoolsHttpRequest {
         url: url,
         method: Method::GET,
diff --git a/components/net/tests/http_loader.rs b/components/net/tests/http_loader.rs
index b60ac325d0a..6c551440a82 100644
--- a/components/net/tests/http_loader.rs
+++ b/components/net/tests/http_loader.rs
@@ -136,14 +136,12 @@ fn test_check_default_headers_loaded_in_every_request() {
 
     headers.insert(
         header::ACCEPT,
-        HeaderValue::from_static(
-            "text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8",
-        ),
+        HeaderValue::from_static("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"),
     );
 
     headers.insert(
         header::ACCEPT_LANGUAGE,
-        HeaderValue::from_static("en-US, en; q=0.5"),
+        HeaderValue::from_static("en-US,en;q=0.5"),
     );
 
     headers.typed_insert::<UserAgent>(crate::DEFAULT_USER_AGENT.parse().unwrap());
@@ -268,25 +266,25 @@ fn test_request_and_response_data_with_network_messages() {
     //Creating default headers for request
     let mut headers = HeaderMap::new();
 
-    headers.insert(
-        header::ACCEPT_ENCODING,
-        HeaderValue::from_static("gzip, deflate, br"),
-    );
+    headers.insert(header::HOST, HeaderValue::from_static("bar.foo"));
 
     headers.insert(
         header::ACCEPT,
-        HeaderValue::from_static(
-            "text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8",
-        ),
+        HeaderValue::from_static("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"),
     );
 
     headers.insert(
         header::ACCEPT_LANGUAGE,
-        HeaderValue::from_static("en-US, en; q=0.5"),
+        HeaderValue::from_static("en-US,en;q=0.5"),
     );
 
     headers.typed_insert::<UserAgent>(crate::DEFAULT_USER_AGENT.parse().unwrap());
 
+    headers.insert(
+        header::ACCEPT_ENCODING,
+        HeaderValue::from_static("gzip, deflate, br"),
+    );
+
     let httprequest = DevtoolsHttpRequest {
         url: url,
         method: Method::GET,
@@ -902,7 +900,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
                 .unwrap()
                 .to_str()
                 .unwrap(),
-            "text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8"
+            "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"
         );
         *response.body_mut() = b"Yay!".to_vec().into();
     };