Fix most typoes for: "referer" -> "referrer"

components/net/fetch/methods.rs

@@ -24,7 +24,7 @@ use mime_guess::guess_mime_type;
 use msg::constellation_msg::ReferrerPolicy;
 use net_traits::FetchTaskTarget;
 use net_traits::request::{CacheMode, CredentialsMode, Destination};
-use net_traits::request::{RedirectMode, Referer, Request, RequestMode, ResponseTainting};
+use net_traits::request::{RedirectMode, Referrer, Request, RequestMode, ResponseTainting};
 use net_traits::request::{Type, Origin, Window};
 use net_traits::response::{HttpsState, TerminationReason};
 use net_traits::response::{Response, ResponseBody, ResponseType};
@@ -156,24 +156,24 @@ fn main_fetch(request: Rc<Request>, cache: &mut CORSCache, cors_flag: bool,
     // TODO this step (CSP port/content blocking)
 
     // Step 6
-    // TODO this step (referer policy)
-    // currently the clients themselves set referer policy in RequestInit
+    // TODO this step (referrer policy)
+    // currently the clients themselves set referrer policy in RequestInit
 
     // Step 7
     if request.referrer_policy.get().is_none() {
         request.referrer_policy.set(Some(ReferrerPolicy::NoReferrerWhenDowngrade));
     }
 
     // Step 8
-    if *request.referer.borrow() != Referer::NoReferer {
-        // remove Referer headers set in past redirects/preflights
+    if *request.referrer.borrow() != Referrer::NoReferrer {
+        // remove Referrer headers set in past redirects/preflights
         // this stops the assertion in determine_request_referrer from failing
         request.headers.borrow_mut().remove::<RefererHeader>();
         let referrer_url = determine_request_referrer(&mut *request.headers.borrow_mut(),
                                                       request.referrer_policy.get(),
-                                                      request.referer.borrow_mut().take(),
+                                                      request.referrer.borrow_mut().take(),
                                                       request.current_url().clone());
-        *request.referer.borrow_mut() = Referer::from_url(referrer_url);
+        *request.referrer.borrow_mut() = Referrer::from_url(referrer_url);
     }
 
     // Step 9
@@ -745,12 +745,12 @@ fn http_network_or_cache_fetch(request: Rc<Request>,
     }
 
     // Step 6
-    match *http_request.referer.borrow() {
-        Referer::NoReferer => (),
-        Referer::RefererUrl(ref http_request_referer) =>
-            http_request.headers.borrow_mut().set(RefererHeader(http_request_referer.to_string())),
-        Referer::Client =>
-            // it should be impossible for referer to be anything else during fetching
+    match *http_request.referrer.borrow() {
+        Referrer::NoReferrer => (),
+        Referrer::ReferrerUrl(ref http_request_referrer) =>
+            http_request.headers.borrow_mut().set(RefererHeader(http_request_referrer.to_string())),
+        Referrer::Client =>
+            // it should be impossible for referrer to be anything else during fetching
             // https://fetch.spec.whatwg.org/#concept-request-referrer
             unreachable!()
     };
@@ -796,7 +796,7 @@ fn http_network_or_cache_fetch(request: Rc<Request>,
     let current_url = http_request.current_url();
     // Step 12
     // todo: pass referrer url and policy
-    // this can only be uncommented when the referer header is set, else it crashes
+    // this can only be uncommented when the referrer header is set, else it crashes
     // in the meantime, we manually set the headers in the block below
     // modify_request_headers(&mut http_request.headers.borrow_mut(), &current_url,
     //                        None, None, None);
@@ -1112,7 +1112,7 @@ fn cors_preflight_fetch(request: Rc<Request>, cache: &mut CORSCache,
     preflight.initiator = request.initiator.clone();
     preflight.type_ = request.type_.clone();
     preflight.destination = request.destination.clone();
-    *preflight.referer.borrow_mut() = request.referer.borrow().clone();
+    *preflight.referrer.borrow_mut() = request.referrer.borrow().clone();
     preflight.referrer_policy.set(request.referrer_policy.get());
 
     // Step 2

components/net/http_loader.rs

@@ -676,8 +676,8 @@ pub fn modify_request_headers(headers: &mut Headers,
                                                referrer_url.clone(),
                                                url.clone());
 
-    if let Some(referer_val) = referrer_url.clone() {
-        headers.set(Referer(referer_val.into_string()));
+    if let Some(referrer_val) = referrer_url.clone() {
+        headers.set(Referer(referrer_val.into_string()));
     }
 }
 

components/net_traits/request.rs

@@ -43,11 +43,11 @@ pub enum Origin {
 
 /// A [referer](https://fetch.spec.whatwg.org/#concept-request-referrer)
 #[derive(Clone, PartialEq, HeapSizeOf)]
-pub enum Referer {
-    NoReferer,
-    /// Default referer if nothing is specified
+pub enum Referrer {
+    NoReferrer,
+    /// Default referrer if nothing is specified
     Client,
-    RefererUrl(Url)
+    ReferrerUrl(Url)
 }
 
 /// A [request mode](https://fetch.spec.whatwg.org/#concept-request-mode)
@@ -132,7 +132,7 @@ pub struct RequestInit {
     // doesn't have info about the client right now
     pub origin: Url,
     // XXXManishearth these should be part of the client object
-    pub referer_url: Option<Url>,
+    pub referrer_url: Option<Url>,
     pub referrer_policy: Option<ReferrerPolicy>,
     pub pipeline_id: Option<PipelineId>,
 }
@@ -164,7 +164,7 @@ pub struct Request {
     pub omit_origin_header: Cell<bool>,
     pub same_origin_data: Cell<bool>,
     /// https://fetch.spec.whatwg.org/#concept-request-referrer
-    pub referer: RefCell<Referer>,
+    pub referrer: RefCell<Referrer>,
     pub referrer_policy: Cell<Option<ReferrerPolicy>>,
     pub pipeline_id: Cell<Option<PipelineId>>,
     pub synchronous: bool,
@@ -205,7 +205,7 @@ impl Request {
             origin: RefCell::new(origin.unwrap_or(Origin::Client)),
             omit_origin_header: Cell::new(false),
             same_origin_data: Cell::new(false),
-            referer: RefCell::new(Referer::Client),
+            referrer: RefCell::new(Referrer::Client),
             referrer_policy: Cell::new(None),
             pipeline_id: Cell::new(pipeline_id),
             synchronous: false,
@@ -238,10 +238,10 @@ impl Request {
         req.use_cors_preflight = init.use_cors_preflight;
         req.credentials_mode = init.credentials_mode;
         req.use_url_credentials = init.use_url_credentials;
-        *req.referer.borrow_mut() = if let Some(url) = init.referer_url {
-            Referer::RefererUrl(url)
+        *req.referrer.borrow_mut() = if let Some(url) = init.referrer_url {
+            Referrer::ReferrerUrl(url)
         } else {
-            Referer::NoReferer
+            Referrer::NoReferrer
         };
         req.referrer_policy.set(init.referrer_policy);
         req.pipeline_id.set(init.pipeline_id);
@@ -271,7 +271,7 @@ impl Request {
             origin: RefCell::new(Origin::Client),
             omit_origin_header: Cell::new(false),
             same_origin_data: Cell::new(false),
-            referer: RefCell::new(Referer::Client),
+            referrer: RefCell::new(Referrer::Client),
             referrer_policy: Cell::new(None),
             synchronous: false,
             // Step 1-2
@@ -325,26 +325,26 @@ impl Request {
     }
 }
 
-impl Referer {
+impl Referrer {
     pub fn to_url(&self) -> Option<&Url> {
         match *self {
-            Referer::NoReferer | Referer::Client => None,
-            Referer::RefererUrl(ref url) => Some(url)
+            Referrer::NoReferrer | Referrer::Client => None,
+            Referrer::ReferrerUrl(ref url) => Some(url)
         }
     }
     pub fn from_url(url: Option<Url>) -> Self {
         if let Some(url) = url {
-            Referer::RefererUrl(url)
+            Referrer::ReferrerUrl(url)
         } else {
-            Referer::NoReferer
+            Referrer::NoReferrer
         }
     }
     pub fn take(&mut self) -> Option<Url> {
-        let mut new = Referer::Client;
+        let mut new = Referrer::Client;
         swap(self, &mut new);
         match new {
-            Referer::NoReferer | Referer::Client => None,
-            Referer::RefererUrl(url) => Some(url)
+            Referrer::NoReferrer | Referrer::Client => None,
+            Referrer::ReferrerUrl(url) => Some(url)
         }
     }
 }

components/script/dom/request.rs

@@ -28,7 +28,7 @@ use net_traits::request::CacheMode as NetTraitsRequestCache;
 use net_traits::request::CredentialsMode as NetTraitsRequestCredentials;
 use net_traits::request::Destination as NetTraitsRequestDestination;
 use net_traits::request::RedirectMode as NetTraitsRequestRedirect;
-use net_traits::request::Referer as NetTraitsRequestReferer;
+use net_traits::request::Referrer as NetTraitsRequestReferrer;
 use net_traits::request::Request as NetTraitsRequest;
 use net_traits::request::RequestMode as NetTraitsRequestMode;
 use net_traits::request::Type as NetTraitsRequestType;
@@ -154,7 +154,7 @@ impl Request {
         *request.origin.borrow_mut() = Origin::Client;
         request.omit_origin_header = temporary_request.omit_origin_header;
         request.same_origin_data.set(true);
-        request.referer = temporary_request.referer;
+        request.referrer = temporary_request.referrer;
         request.referrer_policy = temporary_request.referrer_policy;
         request.mode = temporary_request.mode;
         request.credentials_mode = temporary_request.credentials_mode;
@@ -182,7 +182,7 @@ impl Request {
                 // Step 13.2
                 request.omit_origin_header.set(false);
                 // Step 13.3
-                *request.referer.borrow_mut() = NetTraitsRequestReferer::Client;
+                *request.referrer.borrow_mut() = NetTraitsRequestReferrer::Client;
                 // Step 13.4
                 request.referrer_policy.set(None);
             }
@@ -193,7 +193,7 @@ impl Request {
             let ref referrer = init_referrer.0;
             // Step 14.2
             if referrer.is_empty() {
-                *request.referer.borrow_mut() = NetTraitsRequestReferer::NoReferer;
+                *request.referrer.borrow_mut() = NetTraitsRequestReferrer::NoReferrer;
             } else {
                 // Step 14.3
                 let parsed_referrer = base_url.join(referrer);
@@ -207,15 +207,15 @@ impl Request {
                     if parsed_referrer.cannot_be_a_base() &&
                         parsed_referrer.scheme() == "about" &&
                         parsed_referrer.path() == "client" {
-                            *request.referer.borrow_mut() = NetTraitsRequestReferer::Client;
+                            *request.referrer.borrow_mut() = NetTraitsRequestReferrer::Client;
                         } else {
                             // Step 14.6
                             if parsed_referrer.origin() != origin {
                                 return Err(Error::Type(
                                     "RequestInit's referrer has invalid origin".to_string()));
                             }
                             // Step 14.7
-                            *request.referer.borrow_mut() = NetTraitsRequestReferer::RefererUrl(parsed_referrer);
+                            *request.referrer.borrow_mut() = NetTraitsRequestReferrer::ReferrerUrl(parsed_referrer);
                         }
                 }
             }
@@ -538,11 +538,11 @@ impl RequestMethods for Request {
     // https://fetch.spec.whatwg.org/#dom-request-referrer
     fn Referrer(&self) -> USVString {
         let r = self.request.borrow();
-        let referrer = r.referer.borrow();
+        let referrer = r.referrer.borrow();
         USVString(match &*referrer {
-            &NetTraitsRequestReferer::NoReferer => String::from("no-referrer"),
-            &NetTraitsRequestReferer::Client => String::from("client"),
-            &NetTraitsRequestReferer::RefererUrl(ref u) => {
+            &NetTraitsRequestReferrer::NoReferrer => String::from("no-referrer"),
+            &NetTraitsRequestReferrer::Client => String::from("client"),
+            &NetTraitsRequestReferrer::ReferrerUrl(ref u) => {
                 let u_c = u.clone();
                 u_c.into_string()
             }

components/script/dom/xmlhttprequest.rs

@@ -593,7 +593,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
             credentials_mode: credentials_mode,
             use_url_credentials: use_url_credentials,
             origin: self.global().r().get_url(),
-            referer_url: self.referrer_url.clone(),
+            referrer_url: self.referrer_url.clone(),
             referrer_policy: self.referrer_policy.clone(),
             pipeline_id: self.pipeline_id(),
         };