From a315f8db9ec080b00eb9fb3334bbd826967c198a Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 12 Apr 2016 18:05:28 -0400
Subject: [PATCH] Reorganize header manipulation that occurs before sending an
 HTTP request so we can provide the full set of headers while creating a
 request.

---
 components/net/http_loader.rs | 56 +++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index fd6f98c7c3d..e8e0ad682e1 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -639,6 +639,7 @@ pub fn obtain_response<A>(request_factory: &HttpRequestFactory<R=A>,
                           request_id: &str)
                           -> Result<A::R, LoadError> where A: HttpRequest + 'static  {
 
+    let null_data = None;
     let response;
     let connection_url = replace_hosts(&url);
 
@@ -647,20 +648,7 @@ pub fn obtain_response<A>(request_factory: &HttpRequestFactory<R=A>,
     // a ConnectionAborted error. this loop tries again with a new
     // connection.
     loop {
-        let mut req = try!(request_factory.create_with_headers(connection_url.clone(), method.clone(),
-                                                               request_headers.clone()));
-
-        if cancel_listener.is_cancelled() {
-            return Err(LoadError::Cancelled(connection_url.clone(), "load cancelled".to_owned()));
-        }
-
-        if log_enabled!(log::LogLevel::Info) {
-            info!("{}", method);
-            for header in req.headers_mut().iter() {
-                info!(" - {}", header);
-            }
-            info!("{:?}", data);
-        }
+        let mut headers = request_headers.clone();
 
         // Avoid automatically sending request body if a redirect has occurred.
         //
@@ -669,26 +657,42 @@ pub fn obtain_response<A>(request_factory: &HttpRequestFactory<R=A>,
         //
         // https://tools.ietf.org/html/rfc7231#section-6.4
         let is_redirected_request = iters != 1;
-        let cloned_data;
-        let maybe_response = match data {
+        let request_body;
+        match data {
             &Some(ref d) if !is_redirected_request => {
-                req.headers_mut().set(ContentLength(d.len() as u64));
-                cloned_data = data.clone();
-                req.send(data)
-            },
+                headers.set(ContentLength(d.len() as u64));
+                request_body = data;
+            }
             _ => {
                 if *load_data_method != Method::Get && *load_data_method != Method::Head {
-                    req.headers_mut().set(ContentLength(0))
+                    headers.set(ContentLength(0))
                 }
-                cloned_data = None;
-                req.send(&None)
+                request_body = &null_data;
             }
-        };
+        }
+
+        if log_enabled!(log::LogLevel::Info) {
+            info!("{}", method);
+            for header in headers.iter() {
+                info!(" - {}", header);
+            }
+            info!("{:?}", data);
+        }
+
+        let req = try!(request_factory.create_with_headers(connection_url.clone(), method.clone(),
+                                                           headers.clone()));
+
+        if cancel_listener.is_cancelled() {
+            return Err(LoadError::Cancelled(connection_url.clone(), "load cancelled".to_owned()));
+        }
+
+        let maybe_response = req.send(request_body);
+
         if let Some(pipeline_id) = *pipeline_id {
             send_request_to_devtools(
                 devtools_chan.clone(), request_id.clone().into(),
-                url.clone(), method.clone(), request_headers.clone(),
-                cloned_data, pipeline_id, time::now()
+                url.clone(), method.clone(), headers,
+                request_body.clone(), pipeline_id, time::now()
             );
         }