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

Set cookies in http_network_fetch.

Browse source
This commit is contained in:
Ms2ger 2016-10-20 09:47:49 +02:00
parent 2d430050a8
commit b9ad395a61
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/net/fetch/methods.rs
View file

@ -10,7 +10,7 @@ use fetch::cors_cache::CORSCache;
use filemanager_thread::{FileManager, UIProvider}; use filemanager_thread::{FileManager, UIProvider};
use http_loader::{HttpState, set_default_accept_encoding, set_request_cookies}; use http_loader::{HttpState, set_default_accept_encoding, set_request_cookies};
use http_loader::{NetworkHttpRequestFactory, ReadResult, StreamedResponse, obtain_response, read_block}; use http_loader::{NetworkHttpRequestFactory, ReadResult, StreamedResponse, obtain_response, read_block};
use http_loader::{auth_from_cache, determine_request_referrer}; use http_loader::{auth_from_cache, determine_request_referrer, set_cookies_from_headers};
use http_loader::{send_response_to_devtools, send_request_to_devtools, LoadErrorType}; use http_loader::{send_response_to_devtools, send_request_to_devtools, LoadErrorType};
use hyper::header::{Accept, AcceptLanguage, Authorization, AccessControlAllowCredentials}; use hyper::header::{Accept, AcceptLanguage, Authorization, AccessControlAllowCredentials};
use hyper::header::{AccessControlAllowOrigin, AccessControlAllowHeaders, AccessControlAllowMethods}; use hyper::header::{AccessControlAllowOrigin, AccessControlAllowHeaders, AccessControlAllowMethods};
@ -980,7 +980,7 @@ fn http_network_or_cache_fetch<UI: 'static + UIProvider>(request: Rc<Request>,
/// [HTTP network fetch](https://fetch.spec.whatwg.org/#http-network-fetch) /// [HTTP network fetch](https://fetch.spec.whatwg.org/#http-network-fetch)
fn http_network_fetch<UI: 'static + UIProvider>(request: Rc<Request>, fn http_network_fetch<UI: 'static + UIProvider>(request: Rc<Request>,
_credentials_flag: bool, credentials_flag: bool,
done_chan: &mut DoneChannel, done_chan: &mut DoneChannel,
context: &FetchContext<UI>) context: &FetchContext<UI>)
-> Response { -> Response {
@ -1148,8 +1148,13 @@ fn http_network_fetch<UI: 'static + UIProvider>(request: Rc<Request>,
// TODO this step isn't possible yet // TODO this step isn't possible yet
// Step 13 // Step 13
// Step 14.
if credentials_flag {
set_cookies_from_headers(&url, &response.headers, &context.state.cookie_jar);
}
// TODO these steps // TODO these steps
// Step 14 // Step 15
// Substep 1 // Substep 1
// Substep 2 // Substep 2
// Sub-substep 1 // Sub-substep 1
@ -1158,7 +1163,7 @@ fn http_network_fetch<UI: 'static + UIProvider>(request: Rc<Request>,
// Sub-substep 4 // Sub-substep 4
// Substep 3 // Substep 3
// Step 15 // Step 16
response response
} }

2
components/net/http_loader.rs
View file

@ -499,7 +499,7 @@ fn set_cookie_for_url(cookie_jar: &Arc<RwLock<CookieStorage>>,
} }
} }
fn set_cookies_from_headers(url: &Url, headers: &Headers, cookie_jar: &Arc<RwLock<CookieStorage>>) { pub fn set_cookies_from_headers(url: &Url, headers: &Headers, cookie_jar: &Arc<RwLock<CookieStorage>>) {
if let Some(cookies) = headers.get_raw("set-cookie") { if let Some(cookies) = headers.get_raw("set-cookie") {
for cookie in cookies.iter() { for cookie in cookies.iter() {
if let Ok(cookie_value) = String::from_utf8(cookie.clone()) { if let Ok(cookie_value) = String::from_utf8(cookie.clone()) {