aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/net/fetch/methods.rs68
-rw-r--r--components/net/http_loader.rs18
-rw-r--r--components/net/resource_thread.rs7
-rw-r--r--tests/unit/net/data_loader.rs4
-rw-r--r--tests/unit/net/fetch.rs66
-rw-r--r--tests/unit/net/http_loader.rs65
-rw-r--r--tests/unit/net/lib.rs34
7 files changed, 120 insertions, 142 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 052e5e31ced..9eedd748c2d 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -25,7 +25,7 @@ use std::mem;
use std::rc::Rc;
use std::sync::mpsc::{Sender, Receiver};
-pub type Target = Option<Box<FetchTaskTarget + Send>>;
+pub type Target<'a> = &'a mut (FetchTaskTarget + Send);
pub enum Data {
Payload(Vec<u8>),
@@ -43,17 +43,15 @@ pub type DoneChannel = Option<(Sender<Data>, Receiver<Data>)>;
/// [Fetch](https://fetch.spec.whatwg.org#concept-fetch)
pub fn fetch(request: Rc<Request>,
- target: &mut Target,
- context: &FetchContext)
- -> Response {
- fetch_with_cors_cache(request, &mut CorsCache::new(), target, context)
+ target: Target,
+ context: &FetchContext) {
+ fetch_with_cors_cache(request, &mut CorsCache::new(), target, context);
}
pub fn fetch_with_cors_cache(request: Rc<Request>,
cache: &mut CorsCache,
- target: &mut Target,
- context: &FetchContext)
- -> Response {
+ target: Target,
+ context: &FetchContext) {
// Step 1
if request.window.get() == Window::Client {
// TODO: Set window to request's client object if client is a Window object
@@ -112,7 +110,7 @@ pub fn fetch_with_cors_cache(request: Rc<Request>,
}
// Step 7
- main_fetch(request, cache, false, false, target, &mut None, &context)
+ main_fetch(request, cache, false, false, target, &mut None, &context);
}
/// [Main fetch](https://fetch.spec.whatwg.org/#concept-main-fetch)
@@ -120,7 +118,7 @@ pub fn main_fetch(request: Rc<Request>,
cache: &mut CorsCache,
cors_flag: bool,
recursive_flag: bool,
- target: &mut Target,
+ target: Target,
done_chan: &mut DoneChannel,
context: &FetchContext)
-> Response {
@@ -297,20 +295,16 @@ pub fn main_fetch(request: Rc<Request>,
// Step 19
if request.synchronous {
- if let Some(ref mut target) = *target {
- // process_response is not supposed to be used
- // by sync fetch, but we overload it here for simplicity
- target.process_response(&response);
- }
+ // process_response is not supposed to be used
+ // by sync fetch, but we overload it here for simplicity
+ target.process_response(&response);
if let Some(ref ch) = *done_chan {
loop {
match ch.1.recv()
.expect("fetch worker should always send Done before terminating") {
Data::Payload(vec) => {
- if let Some(ref mut target) = *target {
- target.process_response_chunk(vec);
- }
+ target.process_response_chunk(vec);
}
Data::Done => break,
}
@@ -321,37 +315,29 @@ pub fn main_fetch(request: Rc<Request>,
// in case there was no channel to wait for, the body was
// obtained synchronously via basic_fetch for data/file/about/etc
// We should still send the body across as a chunk
- if let Some(ref mut target) = *target {
- target.process_response_chunk(vec.clone());
- }
+ target.process_response_chunk(vec.clone());
} else {
assert!(*body == ResponseBody::Empty)
}
}
// overloaded similarly to process_response
- if let Some(ref mut target) = *target {
- target.process_response_eof(&response);
- }
+ target.process_response_eof(&response);
return response;
}
// Step 20
if request.body.borrow().is_some() && matches!(request.current_url().scheme(), "http" | "https") {
- if let Some(ref mut target) = *target {
- // XXXManishearth: We actually should be calling process_request
- // in http_network_fetch. However, we can't yet follow the request
- // upload progress, so I'm keeping it here for now and pretending
- // the body got sent in one chunk
- target.process_request_body(&request);
- target.process_request_eof(&request);
- }
+ // XXXManishearth: We actually should be calling process_request
+ // in http_network_fetch. However, we can't yet follow the request
+ // upload progress, so I'm keeping it here for now and pretending
+ // the body got sent in one chunk
+ target.process_request_body(&request);
+ target.process_request_eof(&request);
}
// Step 21
- if let Some(ref mut target) = *target {
- target.process_response(&response);
- }
+ target.process_response(&response);
// Step 22
if let Some(ref ch) = *done_chan {
@@ -359,14 +345,12 @@ pub fn main_fetch(request: Rc<Request>,
match ch.1.recv()
.expect("fetch worker should always send Done before terminating") {
Data::Payload(vec) => {
- if let Some(ref mut target) = *target {
- target.process_response_chunk(vec);
- }
+ target.process_response_chunk(vec);
}
Data::Done => break,
}
}
- } else if let Some(ref mut target) = *target {
+ } else {
let body = response.body.lock().unwrap();
if let ResponseBody::Done(ref vec) = *body {
// in case there was no channel to wait for, the body was
@@ -379,9 +363,7 @@ pub fn main_fetch(request: Rc<Request>,
}
// Step 24
- if let Some(ref mut target) = *target {
- target.process_response_eof(&response);
- }
+ target.process_response_eof(&response);
// TODO remove this line when only asynchronous fetches are used
return response;
@@ -390,7 +372,7 @@ pub fn main_fetch(request: Rc<Request>,
/// [Basic fetch](https://fetch.spec.whatwg.org#basic-fetch)
fn basic_fetch(request: Rc<Request>,
cache: &mut CorsCache,
- target: &mut Target,
+ target: Target,
done_chan: &mut DoneChannel,
context: &FetchContext)
-> Response {
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index f42d49617c1..7904e9f995f 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -42,7 +42,7 @@ use std::collections::HashSet;
use std::error::Error;
use std::io::{self, Read, Write};
use std::iter::FromIterator;
-use std::mem::swap;
+use std::mem;
use std::ops::Deref;
use std::rc::Rc;
use std::sync::{Arc, RwLock};
@@ -533,7 +533,7 @@ pub fn http_fetch(request: Rc<Request>,
cors_flag: bool,
cors_preflight_flag: bool,
authentication_fetch_flag: bool,
- target: &mut Target,
+ target: Target,
done_chan: &mut DoneChannel,
context: &FetchContext)
-> Response {
@@ -707,7 +707,7 @@ fn http_redirect_fetch(request: Rc<Request>,
cache: &mut CorsCache,
response: Response,
cors_flag: bool,
- target: &mut Target,
+ target: Target,
done_chan: &mut DoneChannel,
context: &FetchContext)
-> Response {
@@ -1101,16 +1101,14 @@ fn http_network_fetch(request: Rc<Request>,
}
},
Ok(Data::Done) | Err(_) => {
- let mut empty_vec = Vec::new();
- let completed_body = match *res_body.lock().unwrap() {
+ let mut body = res_body.lock().unwrap();
+ let completed_body = match *body {
ResponseBody::Receiving(ref mut body) => {
- // avoid cloning the body
- swap(body, &mut empty_vec);
- empty_vec
+ mem::replace(body, vec![])
},
- _ => empty_vec,
+ _ => vec![],
};
- *res_body.lock().unwrap() = ResponseBody::Done(completed_body);
+ *body = ResponseBody::Done(completed_body);
let _ = done_sender.send(Data::Done);
break;
}
diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs
index 7055f928ad7..6eeb3aa6122 100644
--- a/components/net/resource_thread.rs
+++ b/components/net/resource_thread.rs
@@ -18,7 +18,7 @@ use hyper::header::{Header, SetCookie};
use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcReceiverSet, IpcSender};
use net_traits::{CookieSource, CoreResourceThread};
-use net_traits::{CoreResourceMsg, FetchResponseMsg, FetchTaskTarget};
+use net_traits::{CoreResourceMsg, FetchResponseMsg};
use net_traits::{CustomResponseMediator, ResourceId};
use net_traits::{ResourceThreads, WebSocketCommunicate, WebSocketConnectData};
use net_traits::request::{Request, RequestInit};
@@ -332,7 +332,7 @@ impl CoreResourceManager {
fn fetch(&self,
init: RequestInit,
- sender: IpcSender<FetchResponseMsg>,
+ mut sender: IpcSender<FetchResponseMsg>,
group: &ResourceGroup) {
let http_state = HttpState {
hsts_list: group.hsts_list.clone(),
@@ -349,14 +349,13 @@ impl CoreResourceManager {
// todo load context / mimesniff in fetch
// todo referrer policy?
// todo service worker stuff
- let mut target = Some(Box::new(sender) as Box<FetchTaskTarget + Send + 'static>);
let context = FetchContext {
state: http_state,
user_agent: ua,
devtools_chan: dc,
filemanager: filemanager,
};
- fetch(Rc::new(request), &mut target, &context);
+ fetch(Rc::new(request), &mut sender, &context);
}).expect("Thread spawning failed");
}
diff --git a/tests/unit/net/data_loader.rs b/tests/unit/net/data_loader.rs
index 93c625f30d9..8cd9ddbb953 100644
--- a/tests/unit/net/data_loader.rs
+++ b/tests/unit/net/data_loader.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use fetch_sync;
+use fetch;
use hyper::header::ContentType;
use hyper::mime::{Attr, Mime, SubLevel, TopLevel, Value};
use hyper_serde::Serde;
@@ -21,7 +21,7 @@ fn assert_parse(url: &'static str,
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
match data {
Some(data) => {
diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs
index c5eb51b69f8..b2047056253 100644
--- a/tests/unit/net/fetch.rs
+++ b/tests/unit/net/fetch.rs
@@ -2,10 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use {DEFAULT_USER_AGENT, FetchResponseCollector, new_fetch_context, fetch_async, fetch_sync, make_server};
+use {DEFAULT_USER_AGENT, new_fetch_context, fetch, make_server};
use devtools_traits::DevtoolsControlMsg;
use devtools_traits::HttpRequest as DevtoolsHttpRequest;
use devtools_traits::HttpResponse as DevtoolsHttpResponse;
+use fetch_with_context;
+use fetch_with_cors_cache;
use http_loader::{expect_devtools_http_request, expect_devtools_http_response};
use hyper::LanguageTag;
use hyper::header::{Accept, AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowOrigin};
@@ -21,7 +23,6 @@ use hyper::status::StatusCode;
use hyper::uri::RequestUri;
use msg::constellation_msg::TEST_PIPELINE_ID;
use net::fetch::cors_cache::CorsCache;
-use net::fetch::methods::{fetch, fetch_with_cors_cache};
use net_traits::ReferrerPolicy;
use net_traits::request::{Origin, RedirectMode, Referrer, Request, RequestMode};
use net_traits::response::{CacheState, Response, ResponseBody, ResponseType};
@@ -50,7 +51,7 @@ fn test_fetch_response_is_not_network_error() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
if fetch_response.is_network_error() {
@@ -69,7 +70,7 @@ fn test_fetch_response_body_matches_const_message() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -89,7 +90,7 @@ fn test_fetch_aboutblank() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
assert!(!fetch_response.is_network_error());
assert!(*fetch_response.body.lock().unwrap() == ResponseBody::Done(vec![]));
}
@@ -118,7 +119,7 @@ fn test_fetch_blob() {
let request = Request::new(url, Some(Origin::Origin(origin.origin())), false, None);
- let fetch_response = fetch(Rc::new(request), &mut None, &context);
+ let fetch_response = fetch_with_context(request, &context);
assert!(!fetch_response.is_network_error());
@@ -143,7 +144,7 @@ fn test_fetch_file() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
assert!(!fetch_response.is_network_error());
assert_eq!(fetch_response.headers.len(), 1);
let content_type: &ContentType = fetch_response.headers.get().unwrap();
@@ -168,7 +169,7 @@ fn test_fetch_ftp() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
assert!(fetch_response.is_network_error());
}
@@ -178,7 +179,7 @@ fn test_fetch_bogus_scheme() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
assert!(fetch_response.is_network_error());
}
@@ -209,7 +210,7 @@ fn test_cors_preflight_fetch() {
*request.referrer_policy.get_mut() = Some(ReferrerPolicy::Origin);
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -249,10 +250,8 @@ fn test_cors_preflight_cache_fetch() {
let wrapped_request0 = Rc::new(request.clone());
let wrapped_request1 = Rc::new(request);
- let fetch_response0 = fetch_with_cors_cache(wrapped_request0.clone(), &mut cache,
- &mut None, &new_fetch_context(None));
- let fetch_response1 = fetch_with_cors_cache(wrapped_request1.clone(), &mut cache,
- &mut None, &new_fetch_context(None));
+ let fetch_response0 = fetch_with_cors_cache(wrapped_request0.clone(), &mut cache);
+ let fetch_response1 = fetch_with_cors_cache(wrapped_request1.clone(), &mut cache);
let _ = server.close();
assert!(!fetch_response0.is_network_error() && !fetch_response1.is_network_error());
@@ -298,7 +297,7 @@ fn test_cors_preflight_fetch_network_error() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(fetch_response.is_network_error());
@@ -319,7 +318,7 @@ fn test_fetch_response_is_basic_filtered() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -365,7 +364,7 @@ fn test_fetch_response_is_cors_filtered() {
let mut request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.mode = RequestMode::CorsMode;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -396,7 +395,7 @@ fn test_fetch_response_is_opaque_filtered() {
let origin = Origin::Origin(UrlOrigin::new_opaque());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -444,7 +443,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
assert!(!fetch_response.is_network_error());
@@ -481,7 +480,7 @@ fn test_fetch_with_local_urls_only() {
// Set the flag.
request.local_urls_only = true;
- fetch_sync(request, None)
+ fetch(request, None)
};
let local_url = ServoUrl::parse("about:blank").unwrap();
@@ -518,7 +517,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let fetch_response = fetch_sync(request, None);
+ let fetch_response = fetch(request, None);
let _ = server.close();
fetch_response
}
@@ -603,7 +602,7 @@ fn test_fetch_redirect_updates_method_runner(tx: Sender<bool>, status_code: Stat
*request.referrer.borrow_mut() = Referrer::NoReferrer;
*request.method.borrow_mut() = method;
- let _ = fetch_sync(request, None);
+ let _ = fetch(request, None);
let _ = server.close();
}
@@ -677,13 +676,8 @@ fn test_fetch_async_returns_complete_response() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let (tx, rx) = channel();
- let listener = Box::new(FetchResponseCollector {
- sender: tx.clone()
- });
+ let fetch_response = fetch(request, None);
- fetch_async(request, listener, None);
- let fetch_response = rx.recv().unwrap();
let _ = server.close();
assert_eq!(response_is_done(&fetch_response), true);
@@ -702,13 +696,8 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
- let (tx, rx) = channel();
- let listener = Box::new(FetchResponseCollector {
- sender: tx.clone()
- });
+ let fetch_response = fetch(request, None);
- fetch_async(request, listener, None);
- let fetch_response = rx.recv().unwrap();
let _ = server.close();
assert_eq!(fetch_response.response_type, ResponseType::Opaque);
@@ -743,13 +732,8 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
*request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
- let (tx, rx) = channel();
- let listener = Box::new(FetchResponseCollector {
- sender: tx.clone()
- });
+ let fetch_response = fetch(request, None);
- fetch_async(request, listener, None);
- let fetch_response = rx.recv().unwrap();
let _ = server.close();
assert_eq!(fetch_response.response_type, ResponseType::OpaqueRedirect);
@@ -771,7 +755,7 @@ fn test_fetch_with_devtools() {
let (devtools_chan, devtools_port) = channel::<DevtoolsControlMsg>();
- let _ = fetch_sync(request, Some(devtools_chan));
+ let _ = fetch(request, Some(devtools_chan));
let _ = server.close();
// notification received from devtools
diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index c2af331b348..c2b720517f7 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -7,7 +7,8 @@ use cookie_rs::Cookie as CookiePair;
use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg, NetworkEvent};
use devtools_traits::HttpRequest as DevtoolsHttpRequest;
use devtools_traits::HttpResponse as DevtoolsHttpResponse;
-use fetch_sync;
+use fetch;
+use fetch_with_context;
use flate2::Compression;
use flate2::write::{DeflateEncoder, GzEncoder};
use hyper::LanguageTag;
@@ -24,7 +25,6 @@ use make_server;
use msg::constellation_msg::TEST_PIPELINE_ID;
use net::cookie::Cookie;
use net::cookie_storage::CookieStorage;
-use net::fetch::methods::fetch;
use net::resource_thread::AuthCacheEntry;
use net_traits::{CookieSource, NetworkError};
use net_traits::hosts::replace_host_table;
@@ -34,7 +34,6 @@ use new_fetch_context;
use servo_url::ServoUrl;
use std::collections::HashMap;
use std::io::{Read, Write};
-use std::rc::Rc;
use std::sync::{Arc, Mutex, RwLock, mpsc};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::mpsc::Receiver;
@@ -143,7 +142,7 @@ fn test_check_default_headers_loaded_in_every_request() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
assert!(response.status.unwrap().is_success());
// Testing for method.POST
@@ -157,7 +156,7 @@ fn test_check_default_headers_loaded_in_every_request() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@@ -179,7 +178,7 @@ fn test_load_when_request_is_not_get_or_head_and_there_is_no_body_content_length
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
assert!(response.status.unwrap().is_success());
let _ = server.close();
@@ -206,7 +205,7 @@ fn test_request_and_response_data_with_network_messages() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
- let response = fetch_sync(request, Some(devtools_chan));
+ let response = fetch(request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@@ -293,7 +292,7 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
- let response = fetch_sync(request, Some(devtools_chan));
+ let response = fetch(request, Some(devtools_chan));
assert!(response.status.unwrap().is_success());
let _ = server.close();
@@ -328,7 +327,7 @@ fn test_redirected_request_to_devtools() {
.. RequestInit::default()
});
let (devtools_chan, devtools_port) = mpsc::channel();
- let response = fetch_sync(request, Some(devtools_chan));
+ let response = fetch(request, Some(devtools_chan));
let _ = pre_server.close();
let _ = post_server.close();
@@ -375,7 +374,7 @@ fn test_load_when_redirecting_from_a_post_should_rewrite_next_request_as_get() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = pre_server.close();
let _ = post_server.close();
@@ -403,7 +402,7 @@ fn test_load_should_decode_the_response_as_deflate_when_response_headers_have_co
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -432,7 +431,7 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -470,7 +469,7 @@ fn test_load_doesnt_send_request_body_on_any_redirect() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = pre_server.close();
let _ = post_server.close();
@@ -496,7 +495,7 @@ fn test_load_doesnt_add_host_to_sts_list_when_url_is_http_even_if_sts_headers_ar
.. RequestInit::default()
});
let context = new_fetch_context(None);
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -526,7 +525,7 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -566,7 +565,7 @@ fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_re
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -604,7 +603,7 @@ fn test_load_sends_cookie_if_nonhttp() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -635,7 +634,7 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl(
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -670,7 +669,7 @@ fn test_when_cookie_received_marked_secure_is_ignored_for_http() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -698,7 +697,7 @@ fn test_load_sets_content_length_to_length_of_request_body() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -726,7 +725,7 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -753,7 +752,7 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -781,7 +780,7 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -808,7 +807,7 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -844,7 +843,7 @@ fn test_load_errors_when_there_a_redirect_loop() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server_a.close();
let _ = server_b.close();
@@ -887,7 +886,7 @@ fn test_load_succeeds_with_a_redirect_loop() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server_a.close();
let _ = server_b.close();
@@ -924,7 +923,7 @@ fn test_load_follows_a_redirect() {
pipeline_id: Some(TEST_PIPELINE_ID),
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = pre_server.close();
let _ = post_server.close();
@@ -1002,7 +1001,7 @@ fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -1046,7 +1045,7 @@ fn test_redirect_from_x_to_x_provides_x_with_cookie_from_first_response() {
credentials_mode: CredentialsMode::Include,
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -1087,7 +1086,7 @@ fn test_if_auth_creds_not_in_url_but_in_cache_it_sets_it() {
context.state.auth_cache.write().unwrap().entries.insert(url.origin().clone().ascii_serialization(), auth_entry);
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -1113,7 +1112,7 @@ fn test_auth_ui_needs_www_auth() {
.. RequestInit::default()
});
- let response = fetch_sync(request, None);
+ let response = fetch(request, None);
let _ = server.close();
@@ -1145,7 +1144,7 @@ fn test_content_blocked() {
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
@@ -1188,7 +1187,7 @@ fn test_cookies_blocked() {
.. RequestInit::default()
});
- let response = fetch(Rc::new(request), &mut None, &context);
+ let response = fetch_with_context(request, &context);
let _ = server.close();
diff --git a/tests/unit/net/lib.rs b/tests/unit/net/lib.rs
index cb8bc2edf89..6c2f8c7036f 100644
--- a/tests/unit/net/lib.rs
+++ b/tests/unit/net/lib.rs
@@ -36,7 +36,8 @@ extern crate url;
use devtools_traits::DevtoolsControlMsg;
use hyper::server::{Handler, Listening, Server};
-use net::fetch::methods::{FetchContext, fetch};
+use net::fetch::cors_cache::CorsCache;
+use net::fetch::methods::{self, FetchContext};
use net::filemanager_thread::FileManager;
use net::test::HttpState;
use net_traits::FetchTaskTarget;
@@ -44,8 +45,7 @@ use net_traits::request::Request;
use net_traits::response::Response;
use servo_url::ServoUrl;
use std::rc::Rc;
-use std::sync::mpsc::Sender;
-use std::thread;
+use std::sync::mpsc::{Sender, channel};
const DEFAULT_USER_AGENT: &'static str = "Such Browser. Very Layout. Wow.";
@@ -72,14 +72,30 @@ impl FetchTaskTarget for FetchResponseCollector {
}
}
-fn fetch_async(request: Request, target: Box<FetchTaskTarget + Send>, dc: Option<Sender<DevtoolsControlMsg>>) {
- thread::spawn(move || {
- fetch(Rc::new(request), &mut Some(target), &new_fetch_context(dc));
- });
+fn fetch(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
+ fetch_with_context(request, &new_fetch_context(dc))
}
-fn fetch_sync(request: Request, dc: Option<Sender<DevtoolsControlMsg>>) -> Response {
- fetch(Rc::new(request), &mut None, &new_fetch_context(dc))
+fn fetch_with_context(request: Request, context: &FetchContext) -> Response {
+ let (sender, receiver) = channel();
+ let mut target = FetchResponseCollector {
+ sender: sender,
+ };
+
+ methods::fetch(Rc::new(request), &mut target, context);
+
+ receiver.recv().unwrap()
+}
+
+fn fetch_with_cors_cache(request: Rc<Request>, cache: &mut CorsCache) -> Response {
+ let (sender, receiver) = channel();
+ let mut target = FetchResponseCollector {
+ sender: sender,
+ };
+
+ methods::fetch_with_cors_cache(request, cache, &mut target, &new_fetch_context(None));
+
+ receiver.recv().unwrap()
}
fn make_server<H: Handler + 'static>(handler: H) -> (Listening, ServoUrl) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-04 01:16:23 +0000