Use url::Origin as UrlOrigin in http_loader.

This commit is contained in:
Ms2ger 2016-11-22 00:54:18 +01:00
parent 6219105eed
commit 74ea269fc3

View file

@ -36,7 +36,7 @@ use std::sync::{Arc, RwLock};
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use time; use time;
use time::Tm; use time::Tm;
use url::Origin; use url::Origin as UrlOrigin;
pub enum ReadResult { pub enum ReadResult {
Payload(Vec<u8>), Payload(Vec<u8>),
@ -495,7 +495,7 @@ pub fn send_response_to_devtools(devtools_chan: &Sender<DevtoolsControlMsg>,
let _ = devtools_chan.send(DevtoolsControlMsg::FromChrome(msg)); let _ = devtools_chan.send(DevtoolsControlMsg::FromChrome(msg));
} }
pub fn auth_from_cache(auth_cache: &Arc<RwLock<AuthCache>>, origin: &Origin) -> Option<Basic> { pub fn auth_from_cache(auth_cache: &Arc<RwLock<AuthCache>>, origin: &UrlOrigin) -> Option<Basic> {
if let Some(ref auth_entry) = auth_cache.read().unwrap().entries.get(&origin.ascii_serialization()) { if let Some(ref auth_entry) = auth_cache.read().unwrap().entries.get(&origin.ascii_serialization()) {
let user_name = auth_entry.user_name.clone(); let user_name = auth_entry.user_name.clone();
let password = Some(auth_entry.password.clone()); let password = Some(auth_entry.password.clone());