Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Kill Request::omit_origin_header

Browse source
This commit is contained in:
Anthony Ramine 2017-04-07 11:47:57 +02:00
parent 10801caefd
commit 9394469ede
3 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/net/http_loader.rs
View file

@ -824,9 +824,7 @@ fn http_network_or_cache_fetch(request: &mut Request,
}; };
// Step 11 // Step 11
if !http_request.omit_origin_header { if cors_flag || (http_request.method != Method::Get && http_request.method != Method::Head) {
let method = &http_request.method;
if cors_flag || (*method != Method::Get && *method != Method::Head) {
debug_assert!(http_request.origin != Origin::Client); debug_assert!(http_request.origin != Origin::Client);
if let Origin::Origin(ref url_origin) = http_request.origin { if let Origin::Origin(ref url_origin) = http_request.origin {
if let Some(hyper_origin) = try_immutable_origin_to_hyper_origin(url_origin) { if let Some(hyper_origin) = try_immutable_origin_to_hyper_origin(url_origin) {
@ -834,7 +832,6 @@ fn http_network_or_cache_fetch(request: &mut Request,
} }
} }
} }
}
// Step 12 // Step 12
if !http_request.headers.has::<UserAgent>() { if !http_request.headers.has::<UserAgent>() {

2
components/net_traits/request.rs
View file

@ -220,7 +220,6 @@ pub struct Request {
// TODO: priority object // TODO: priority object
/// https://fetch.spec.whatwg.org/#concept-request-origin /// https://fetch.spec.whatwg.org/#concept-request-origin
pub origin: Origin, pub origin: Origin,
pub omit_origin_header: bool,
/// https://fetch.spec.whatwg.org/#concept-request-referrer /// https://fetch.spec.whatwg.org/#concept-request-referrer
pub referrer: Referrer, pub referrer: Referrer,
/// https://fetch.spec.whatwg.org/#concept-request-referrer-policy /// https://fetch.spec.whatwg.org/#concept-request-referrer-policy
@ -273,7 +272,6 @@ impl Request {
type_: Type::None, type_: Type::None,
destination: Destination::None, destination: Destination::None,
origin: origin.unwrap_or(Origin::Client), origin: origin.unwrap_or(Origin::Client),
omit_origin_header: false,
referrer: Referrer::Client, referrer: Referrer::Client,
referrer_policy: None, referrer_policy: None,
pipeline_id: pipeline_id, pipeline_id: pipeline_id,

5
components/script/dom/request.rs
View file

@ -161,7 +161,6 @@ impl Request {
request.window = window; request.window = window;
// TODO: `entry settings object` is not implemented in Servo yet. // TODO: `entry settings object` is not implemented in Servo yet.
request.origin = Origin::Client; request.origin = Origin::Client;
request.omit_origin_header = temporary_request.omit_origin_header;
request.referrer = temporary_request.referrer; request.referrer = temporary_request.referrer;
request.referrer_policy = temporary_request.referrer_policy; request.referrer_policy = temporary_request.referrer_policy;
request.mode = temporary_request.mode; request.mode = temporary_request.mode;
@ -187,10 +186,8 @@ impl Request {
request.mode = NetTraitsRequestMode::SameOrigin; request.mode = NetTraitsRequestMode::SameOrigin;
} }
// Step 13.2 // Step 13.2
request.omit_origin_header = false;
// Step 13.3
request.referrer = NetTraitsRequestReferrer::Client; request.referrer = NetTraitsRequestReferrer::Client;
// Step 13.4 // Step 13.3
request.referrer_policy = None; request.referrer_policy = None;
} }