Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Backout Host-header related change from #32024. (#32093)

Browse source 
#32024 broke a different set of nginx sites, and a more sophisticated fix for the case of a missing HTTP 1.1 `Host` header is required.
This commit is contained in:
Philip Lamb 2024-04-17 00:38:25 +12:00 • committed by GitHub
parent f5bdfdfe94
commit 7a507a4d5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/net/http_loader.rs
View file

@ -1225,20 +1225,7 @@ async fn http_network_or_cache_fetch(
// Step 5.16
let current_url = http_request.current_url();
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(),
));
}
http_request.headers.remove(header::HOST);
// unlike http_loader, we should not set the accept header
// here, according to the fetch spec

9
components/net/tests/fetch.rs
View file

@ -1359,15 +1359,6 @@ fn test_fetch_with_devtools() {
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"),

2
components/net/tests/http_loader.rs
View file

@ -266,8 +266,6 @@ fn test_request_and_response_data_with_network_messages() {
//Creating default headers for request
let mut headers = HeaderMap::new();
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"),