Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

webdriver_server: fix api calls to webdriver-rust

Browse source
This commit is contained in:
Andreas Tolfsen 2016-09-06 17:39:08 +01:00
parent 8a4abdad2d
commit 8a4a90a424
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/webdriver_server/lib.rs
View file

@ -15,6 +15,8 @@ extern crate euclid;
extern crate hyper; extern crate hyper;
extern crate image; extern crate image;
extern crate ipc_channel; extern crate ipc_channel;
#[macro_use]
extern crate log;
extern crate msg; extern crate msg;
extern crate regex; extern crate regex;
extern crate rustc_serialize; extern crate rustc_serialize;
@ -78,10 +80,6 @@ fn cookie_msg_to_cookie(cookie: cookie_rs::Cookie) -> Cookie {
Some(time) => Nullable::Value(Date::new(time.to_timespec().sec as u64)), Some(time) => Nullable::Value(Date::new(time.to_timespec().sec as u64)),
None => Nullable::Null None => Nullable::Null
}, },
maxAge: match cookie.max_age {
Some(time) => Nullable::Value(Date::new(time)),
None => Nullable::Null
},
secure: cookie.secure, secure: cookie.secure,
httpOnly: cookie.httponly, httpOnly: cookie.httponly,
} }
@ -91,8 +89,10 @@ pub fn start_server(port: u16, constellation_chan: Sender<ConstellationMsg>) {
let handler = Handler::new(constellation_chan); let handler = Handler::new(constellation_chan);
spawn_named("WebdriverHttpServer".to_owned(), move || { spawn_named("WebdriverHttpServer".to_owned(), move || {
let address = SocketAddrV4::new("0.0.0.0".parse().unwrap(), port); let address = SocketAddrV4::new("0.0.0.0".parse().unwrap(), port);
server::start(SocketAddr::V4(address), handler, match server::start(SocketAddr::V4(address), handler, extension_routes()) {
extension_routes()); Ok(listening) => info!("WebDriver server listening on {}", listening.socket),
Err(_) => panic!("Unable to start WebDriver HTTPD server"),
}
}); });
} }
@ -847,18 +847,18 @@ impl Handler {
impl WebDriverHandler<ServoExtensionRoute> for Handler { impl WebDriverHandler<ServoExtensionRoute> for Handler {
fn handle_command(&mut self, fn handle_command(&mut self,
_session: &Option<Session>, _session: &Option<Session>,
msg: &WebDriverMessage<ServoExtensionRoute>) -> WebDriverResult<WebDriverResponse> { msg: WebDriverMessage<ServoExtensionRoute>) -> WebDriverResult<WebDriverResponse> {
// Unless we are trying to create a new session, we need to ensure that a // Unless we are trying to create a new session, we need to ensure that a
// session has previously been created // session has previously been created
match msg.command { match msg.command {
WebDriverCommand::NewSession => {}, WebDriverCommand::NewSession(_) => {},
_ => { _ => {
try!(self.session()); try!(self.session());
} }
} }
match msg.command { match msg.command {
WebDriverCommand::NewSession => self.handle_new_session(), WebDriverCommand::NewSession(_) => self.handle_new_session(),
WebDriverCommand::DeleteSession => self.handle_delete_session(), WebDriverCommand::DeleteSession => self.handle_delete_session(),
WebDriverCommand::AddCookie(ref parameters) => self.handle_add_cookie(parameters), WebDriverCommand::AddCookie(ref parameters) => self.handle_add_cookie(parameters),
WebDriverCommand::Get(ref parameters) => self.handle_get(parameters), WebDriverCommand::Get(ref parameters) => self.handle_get(parameters),