diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-05 20:30:45 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-05 20:30:45 -0700 |
| commit | 237cdee9e462bc7b070d9fe1a7722ad961ff25c2 (patch) | |
| tree | fcc4e97a0bc2920d86aa589c6c821ddd4fdec873 /components/servo/main.rs | |
| parent | 6d1c13ea1bc94fe9383da684c6ee0e22851750ec (diff) | |
| parent | c17f04771e56eeb6e813ecfa8857fbe8f4a3ff10 (diff) | |
| download | servo-237cdee9e462bc7b070d9fe1a7722ad961ff25c2.tar.gz servo-237cdee9e462bc7b070d9fe1a7722ad961ff25c2.zip | |
auto merge of #4702 : shinglyu/servo/bug3219, r=jdm
This is a fix for bug #3219 . This patch allows the user to specify a disposiable hostfile using the `HOST_FILE` environment variable. Therefore, we can run tests on test servers without actually changing the system hostfile.
Diffstat (limited to 'components/servo/main.rs')
| -rw-r--r-- | components/servo/main.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/components/servo/main.rs b/components/servo/main.rs index 5d9231e8b38..fa508400dd1 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -12,6 +12,7 @@ extern crate libc; extern crate servo; extern crate time; extern crate util; +extern crate "net" as servo_net; #[cfg(not(test))] extern crate "glutin_app" as app; @@ -30,6 +31,9 @@ use libc::c_int; use util::opts; #[cfg(not(test))] +use servo_net::resource_task; + +#[cfg(not(test))] use servo::Browser; #[cfg(not(test))] use compositing::windowing::WindowEvent; @@ -113,6 +117,7 @@ fn setup_logging() { fn main() { if opts::from_cmdline_args(get_args().as_slice()) { setup_logging(); + resource_task::global_init(); let window = if opts::get().headless { None |