diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2017-04-07 11:47:57 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-04-07 12:52:50 +0200 |
| commit | 9394469ede2dd367af169a5ede3d3d384e3b2fc8 (patch) | |
| tree | 96e6b0a41d29f89ae110155932d7c413f1fbcf2c | |
| parent | 10801caefd5968925a19a05964e09c676d61da05 (diff) | |
| download | servo-9394469ede2dd367af169a5ede3d3d384e3b2fc8.tar.gz servo-9394469ede2dd367af169a5ede3d3d384e3b2fc8.zip | |
Kill Request::omit_origin_header
| -rw-r--r-- | components/net/http_loader.rs | 13 | ||||
| -rw-r--r-- | components/net_traits/request.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/request.rs | 5 |
3 files changed, 6 insertions, 14 deletions
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index fc8645ac2e4..a7a3e213717 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -824,14 +824,11 @@ fn http_network_or_cache_fetch(request: &mut Request, }; // Step 11 - if !http_request.omit_origin_header { - let method = &http_request.method; - if cors_flag || (*method != Method::Get && *method != Method::Head) { - debug_assert!(http_request.origin != Origin::Client); - if let Origin::Origin(ref url_origin) = http_request.origin { - if let Some(hyper_origin) = try_immutable_origin_to_hyper_origin(url_origin) { - http_request.headers.set(hyper_origin) - } + if cors_flag || (http_request.method != Method::Get && http_request.method != Method::Head) { + debug_assert!(http_request.origin != Origin::Client); + if let Origin::Origin(ref url_origin) = http_request.origin { + if let Some(hyper_origin) = try_immutable_origin_to_hyper_origin(url_origin) { + http_request.headers.set(hyper_origin) } } } diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index 9e1a00822f4..a882ce424ba 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -220,7 +220,6 @@ pub struct Request { // TODO: priority object /// https://fetch.spec.whatwg.org/#concept-request-origin pub origin: Origin, - pub omit_origin_header: bool, /// https://fetch.spec.whatwg.org/#concept-request-referrer pub referrer: Referrer, /// https://fetch.spec.whatwg.org/#concept-request-referrer-policy @@ -273,7 +272,6 @@ impl Request { type_: Type::None, destination: Destination::None, origin: origin.unwrap_or(Origin::Client), - omit_origin_header: false, referrer: Referrer::Client, referrer_policy: None, pipeline_id: pipeline_id, diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index acbd5758bed..f33c9eed48d 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -161,7 +161,6 @@ impl Request { request.window = window; // TODO: `entry settings object` is not implemented in Servo yet. request.origin = Origin::Client; - request.omit_origin_header = temporary_request.omit_origin_header; request.referrer = temporary_request.referrer; request.referrer_policy = temporary_request.referrer_policy; request.mode = temporary_request.mode; @@ -187,10 +186,8 @@ impl Request { request.mode = NetTraitsRequestMode::SameOrigin; } // Step 13.2 - request.omit_origin_header = false; - // Step 13.3 request.referrer = NetTraitsRequestReferrer::Client; - // Step 13.4 + // Step 13.3 request.referrer_policy = None; } |