From 9a87f830fc3c8543b5190fa30396d82c47969d0a Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Fri, 12 Jun 2015 21:05:33 +0300 Subject: [PATCH] Preserve UserAgent header on redirect. --- components/net/resource_task.rs | 4 ++- .../wptrunner/executors/executorservo.py | 4 ++- tests/wpt/metadata/MANIFEST.json | 11 +++++++- .../preserve-ua-header-on-redirect.htm | 28 +++++++++++++++++++ 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index 22114f34950d..f888e017220e 100644 --- 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)) -> Box) + Send> { diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py index 3dba844dc324..ef227b38cbf3 100644 --- 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 index 3e15e3e8256d..5b780fd14da7 100644 --- 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 new file mode 100644 index 000000000000..141bddeb8ce4 --- /dev/null +++ b/tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm @@ -0,0 +1,28 @@ + + + + XMLHttpRequest: User-Agent header is preserved on redirect + + + + +
+ + +