From ff6194cc74e26d6ebd62951968ac0eed7d812a4b Mon Sep 17 00:00:00 2001 From: Vincent Ricard Date: Mon, 21 Sep 2020 18:37:58 +0200 Subject: [PATCH] Fix wrong priority for XHR username/password --- components/script/dom/xmlhttprequest.rs | 5 +++-- ...authentication-competing-names-passwords.htm.ini | 13 ------------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 tests/wpt/metadata/xhr/send-authentication-competing-names-passwords.htm.ini diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 4d4ec43fa38..c4594106832 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -390,8 +390,9 @@ impl XMLHttpRequestMethods for XMLHttpRequest { if parsed_url.host().is_some() { if let Some(user_str) = username { parsed_url.set_username(&user_str.0).unwrap(); - let password = password.as_ref().map(|pass_str| &*pass_str.0); - parsed_url.set_password(password).unwrap(); + } + if let Some(pass_str) = password { + parsed_url.set_password(Some(&pass_str.0)).unwrap(); } } diff --git a/tests/wpt/metadata/xhr/send-authentication-competing-names-passwords.htm.ini b/tests/wpt/metadata/xhr/send-authentication-competing-names-passwords.htm.ini deleted file mode 100644 index 1d8c44d4c60..00000000000 --- a/tests/wpt/metadata/xhr/send-authentication-competing-names-passwords.htm.ini +++ /dev/null @@ -1,13 +0,0 @@ -[send-authentication-competing-names-passwords.htm] - [XMLHttpRequest user/pass options: pass in URL, user in open()] - expected: FAIL - - [XMLHttpRequest user/pass options: user in URL, pass in open()] - expected: FAIL - - [XMLHttpRequest user/pass options: user/pass in URL; user in open()] - expected: FAIL - - [XMLHttpRequest user/pass options: user/pass in URL; pass in open()] - expected: FAIL -