servo: Merge #9019 - Use Url.join instead of UrlParser.base_url(...).parse (#9002) (from magopian:9002-use-url.join); r=SimonSapin

Fix issue #9002

Source-Repo: https://github.com/servo/servo
Source-Revision: f9141ef2db693518fef676740f25abee3b938cac
This commit is contained in:
Mathieu Agopian
2015-12-19 01:28:56 +05:00
parent c85382de30
commit c4a46a7e14
41 changed files with 58 additions and 64 deletions

View File

@@ -98,7 +98,7 @@ use std::sync::atomic::{Ordering, AtomicBool};
use std::sync::mpsc::{Receiver, Select, Sender, channel};
use std::sync::{Arc, Mutex};
use time::{Tm, now};
use url::{Url, UrlParser};
use url::Url;
use util::opts;
use util::str::DOMString;
use util::task;
@@ -1840,7 +1840,7 @@ impl ScriptTask {
.and_then(|href| {
let value = href.value();
let url = document.url();
UrlParser::new().base_url(&url).parse(&value).map(|url| url.serialize()).ok()
url.join(&value).map(|url| url.serialize()).ok()
});
let event = ConstellationMsg::NodeStatus(status);
let ConstellationChan(ref chan) = self.constellation_chan;