Preserve UserAgent header on redirect.

servo · Jun 12, 2015 · 9a87f83 · 9a87f83
1 parent c8c7bd9
commit 9a87f83
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 3 deletions.
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
@@ -259,7 +259,9 @@ impl ResourceManager {
             }
         }
 
-        self.user_agent.as_ref().map(|ua| load_data.headers.set(UserAgent(ua.clone())));
+        self.user_agent.as_ref().map(|ua| {
+            load_data.preserved_headers.set(UserAgent(ua.clone()));
+        });
 
         fn from_factory(factory: fn(LoadData, LoadConsumer, Arc<MIMEClassifier>))
                         -> Box<FnBox(LoadData, LoadConsumer, Arc<MIMEClassifier>) + Send> {

diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py
@@ -62,7 +62,9 @@ def do_test(self, test):
         self.result_data = None
         self.result_flag = threading.Event()
 
-        debug_args, command = browser_command(self.binary, ["--cpu", "--hard-fail", "-z", self.test_url(test)],
+        debug_args, command = browser_command(self.binary, ["--cpu", "--hard-fail", "-z",
+                                                            "-u", "Servo/wptrunner",
+                                                            self.test_url(test)],
                                               self.debug_info)
 
         self.command = command

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -25117,7 +25117,16 @@
   },
   "local_changes": {
     "deleted": [],
-    "items": {},
+    "items": {
+      "testharness": {
+        "XMLHttpRequest/preserve-ua-header-on-redirect.htm": [
+          {
+            "path": "XMLHttpRequest/preserve-ua-header-on-redirect.htm",
+            "url": "/XMLHttpRequest/preserve-ua-header-on-redirect.htm"
+          }
+        ]
+      }
+    },
     "reftest_nodes": {}
   },
   "reftest_nodes": {

diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm b/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+  <head>
+    <title>XMLHttpRequest: User-Agent header is preserved on redirect</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <div id="log"></div>
+    <script>
+      var ua = "Servo/wptrunner";
+      var test = async_test()
+      test.step(function() {
+        var client = new XMLHttpRequest()
+          client.onreadystatechange = function() {
+            test.step(function() {
+              if(client.readyState == 4) {
+                assert_equals(client.responseText, "user-agent,")
+                test.done()
+              }
+            })
+          }
+        client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_value="+ua))
+        client.send(null)
+      })
+    </script>
+  </body>
+</html>