mirror of
https://github.com/servo/servo.git
synced 2025-08-05 05:30:08 +01:00
Partial implementation of Main Fetch step, including appropiate updates to tests
This commit is contained in:
parent
842ec7c415
commit
db8cc6eccf
6 changed files with 264 additions and 65 deletions
|
@ -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 hyper::header::Headers;
|
||||
use hyper::header::{AccessControlExposeHeaders, Headers};
|
||||
use hyper::status::StatusCode;
|
||||
use net_traits::response::{CacheState, HttpsState, Response, ResponseBody, ResponseType};
|
||||
use std::ascii::AsciiExt;
|
||||
|
@ -25,7 +25,7 @@ impl ResponseMethods for Response {
|
|||
url_list: RefCell::new(Vec::new()),
|
||||
status: Some(StatusCode::Ok),
|
||||
headers: Headers::new(),
|
||||
body: ResponseBody::Empty,
|
||||
body: RefCell::new(ResponseBody::Empty),
|
||||
cache_state: CacheState::None,
|
||||
https_state: HttpsState::None,
|
||||
internal_response: None
|
||||
|
@ -46,6 +46,7 @@ impl ResponseMethods for Response {
|
|||
let old_headers = old_response.headers.clone();
|
||||
let mut response = (*old_response).clone();
|
||||
response.internal_response = Some(old_response);
|
||||
response.response_type = filter_type;
|
||||
|
||||
match filter_type {
|
||||
|
||||
|
@ -59,26 +60,40 @@ impl ResponseMethods for Response {
|
|||
}
|
||||
}).collect();
|
||||
response.headers = headers;
|
||||
response.response_type = filter_type;
|
||||
},
|
||||
|
||||
ResponseType::CORS => {
|
||||
|
||||
let access = old_headers.get::<AccessControlExposeHeaders>();
|
||||
let allowed_headers = access.as_ref().map(|v| &v[..]).unwrap_or(&[]);
|
||||
|
||||
let headers = old_headers.iter().filter(|header| {
|
||||
match &*header.name().to_ascii_lowercase() {
|
||||
"cache-control" | "content-language" |
|
||||
"content-type" | "expires" | "last-modified" | "Pragma" => false,
|
||||
// XXXManishearth handle Access-Control-Expose-Headers
|
||||
_ => true
|
||||
"content-type" | "expires" | "last-modified" | "Pragma" => true,
|
||||
"set-cookie" | "set-cookie2" => false,
|
||||
header => {
|
||||
let result =
|
||||
allowed_headers.iter().find(|h| *header == *h.to_ascii_lowercase());
|
||||
result.is_some()
|
||||
}
|
||||
}
|
||||
}).collect();
|
||||
response.headers = headers;
|
||||
response.response_type = filter_type;
|
||||
},
|
||||
|
||||
ResponseType::Opaque | ResponseType::OpaqueRedirect => {
|
||||
ResponseType::Opaque => {
|
||||
response.url_list = RefCell::new(vec![]);
|
||||
response.url = None;
|
||||
response.headers = Headers::new();
|
||||
response.status = None;
|
||||
response.body = ResponseBody::Empty;
|
||||
response.body = RefCell::new(ResponseBody::Empty);
|
||||
},
|
||||
|
||||
ResponseType::OpaqueRedirect => {
|
||||
response.headers = Headers::new();
|
||||
response.status = None;
|
||||
response.body = RefCell::new(ResponseBody::Empty);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue