mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Kill Request::omit_origin_header
This commit is contained in:
parent
10801caefd
commit
9394469ede
3 changed files with 6 additions and 14 deletions
|
@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue