aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/cors.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2015-07-10 22:48:05 +0200
committerSimon Sapin <simon.sapin@exyr.org>2015-07-15 00:46:43 +0200
commit83d2a11d860133166ddc22a1551589cfe2476c7f (patch)
tree84d9be35ebbd99e20a99151b0713ac3351ca77f4 /components/script/cors.rs
parent64751b8eef5b95de9ac3b9a382b4cb4408cb90c0 (diff)
downloadservo-83d2a11d860133166ddc22a1551589cfe2476c7f.tar.gz
servo-83d2a11d860133166ddc22a1551589cfe2476c7f.zip
Upgrade to rustc 1.3.0-dev (fddfd089b 2015-07-10)
Diffstat (limited to 'components/script/cors.rs')
-rw-r--r--components/script/cors.rs6
1 files changed, 1 insertions, 5 deletions
diff --git a/components/script/cors.rs b/components/script/cors.rs
index 6587d07bc97..c5a99fac63d 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -460,11 +460,7 @@ fn is_simple_method(m: &Method) -> bool {
pub fn allow_cross_origin_request(req: &CORSRequest, headers: &Headers) -> bool {
match headers.get::<AccessControlAllowOrigin>() {
Some(&AccessControlAllowOrigin::Any) => true, // Not always true, depends on credentials mode
- // FIXME: https://github.com/servo/servo/issues/6020
- Some(&AccessControlAllowOrigin::Value(ref url)) =>
- url.scheme == req.origin.scheme &&
- url.host() == req.origin.host() &&
- url.port() == req.origin.port(),
+ Some(&AccessControlAllowOrigin::Value(ref url)) => req.origin.serialize() == *url,
Some(&AccessControlAllowOrigin::Null) |
None => false
}