Auto merge of #9768 - jdm:add_disallowed_prefixes, r=jdm

disallow restricted XMLHttpRequest header prefixes

Rebased from #9376.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9768)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-27 22:09:46 +05:30
commit 4a7d234510
6 changed files with 30 additions and 35 deletions

View file

@ -523,7 +523,16 @@ pub fn modify_request_headers(headers: &mut Headers,
port: doc_url.port_or_default()
};
headers.set(host);
headers.set(UserAgent(user_agent.to_owned()));
// If the user-agent has not already been set, then use the
// browser's default user-agent or the user-agent override
// from the command line. If the user-agent is set, don't
// modify it, as setting of the user-agent by the user is
// allowed.
// https://fetch.spec.whatwg.org/#concept-http-network-or-cache-fetch step 8
if !headers.has::<UserAgent>() {
headers.set(UserAgent(user_agent.to_owned()));
}
set_default_accept(headers);
set_default_accept_encoding(headers);