From 2d430050a8fa9d52c9bb2634c705e629b35d617c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 20 Oct 2016 09:57:55 +0200 Subject: [PATCH] Only pass the headers to set_cookies_from_response. I will need to call it from the fetch code, which does not have a HttpResponse on hand. Also, rename the function to match its new signature. --- components/net/http_loader.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index c95b7c711c0..80817ebbf52 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -499,8 +499,8 @@ fn set_cookie_for_url(cookie_jar: &Arc>, } } -fn set_cookies_from_response(url: &Url, response: &HttpResponse, cookie_jar: &Arc>) { - if let Some(cookies) = response.headers().get_raw("set-cookie") { +fn set_cookies_from_headers(url: &Url, headers: &Headers, cookie_jar: &Arc>) { + if let Some(cookies) = headers.get_raw("set-cookie") { for cookie in cookies.iter() { if let Ok(cookie_value) = String::from_utf8(cookie.clone()) { set_cookie_for_url(&cookie_jar, @@ -731,7 +731,7 @@ pub fn process_response_headers(response: &HttpResponse, // https://fetch.spec.whatwg.org/#concept-http-network-fetch step 9 if load_data.credentials_flag { - set_cookies_from_response(url, response, cookie_jar); + set_cookies_from_headers(url, response.headers(), cookie_jar); } update_sts_list_from_response(url, response, hsts_list); }