Merge branch 'master' into fix-local-urls-only-10147

This commit is contained in:
Stjepan Glavina 2016-03-24 13:45:25 +01:00
commit 4965c93d16
37 changed files with 193 additions and 165 deletions

View file

@ -294,6 +294,7 @@ fn basic_fetch(request: Rc<Request>) -> Response {
response.headers.set(ContentType(Mime(
TopLevel::Text, SubLevel::Html,
vec![(Attr::Charset, Value::Utf8)])));
*response.body.lock().unwrap() = ResponseBody::Done(vec![]);
response
},
_ => Response::network_error()