# HG changeset patch # User Shane Caraveo # Parent fd2ab5720a9ac61355749e6c883d0b939e87ca1e Bug 1312460 webrequest fails with ftp redirect MozReview-Commit-ID: 52zwfucB5I3 diff --git a/toolkit/components/extensions/test/mochitest/mochitest.ini b/toolkit/components/extensions/test/mochitest/mochitest.ini --- a/toolkit/components/extensions/test/mochitest/mochitest.ini +++ b/toolkit/components/extensions/test/mochitest/mochitest.ini @@ -94,16 +94,18 @@ skip-if = (os == 'android') # Bug 125897 [test_ext_webrequest_background_events.html] skip-if = os == 'android' # webrequest api unsupported (bug 1258975). [test_ext_webrequest_basic.html] skip-if = os == 'android' # webrequest api unsupported (bug 1258975). [test_ext_webrequest_filter.html] skip-if = os == 'android' # webrequest api unsupported (bug 1258975). [test_ext_webrequest_mozextension.html] skip-if = os == 'android' # webrequest api unsupported (bug 1258975). +[test_ext_webrequest_nonhttp.html] +skip-if = os == 'android' # webrequest api unsupported (bug 1258975). [test_ext_webrequest_upload.html] skip-if = os == 'android' # webrequest api unsupported (bug 1258975). [test_ext_webnavigation.html] skip-if = os == 'android' # port.sender.tab is undefined on Android (bug 1258975). [test_ext_webnavigation_filters.html] skip-if = os == 'android' # port.sender.tab is undefined on Android (bug 1258975). [test_ext_window_postMessage.html] [test_ext_subframes_privileges.html] diff --git a/toolkit/components/extensions/test/mochitest/redirection.sjs b/toolkit/components/extensions/test/mochitest/redirection.sjs --- a/toolkit/components/extensions/test/mochitest/redirection.sjs +++ b/toolkit/components/extensions/test/mochitest/redirection.sjs @@ -1,4 +1,14 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ + */ +Components.utils.importGlobalProperties(["URLSearchParams"]); + function handleRequest(aRequest, aResponse) { + let params = new URLSearchParams(aRequest.queryString); aResponse.setStatusLine(aRequest.httpVersion, 302); - aResponse.setHeader("Location", "./dummy_page.html"); + if (params.has("redirect_uri")) { + aResponse.setHeader("Location", params.get("redirect_uri")); + } else { + aResponse.setHeader("Location", "./dummy_page.html"); + } } \ No newline at end of file diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_nonhttp.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_nonhttp.html new file mode 100644 --- /dev/null +++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_nonhttp.html @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + +