Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 16 insertions, 16 deletions

diff --git a/netwerk/test/httpserver/httpd.sys.mjs b/netwerk/test/httpserver/httpd.sys.mjs
index 569e4d1489..b9d728d631 100644
--- a/netwerk/test/httpserver/httpd.sys.mjs
+++ b/netwerk/test/httpserver/httpd.sys.mjs
@@ -450,7 +450,7 @@ nsHttpServer.prototype = {
    *   was stopped using nsIHttpServer.stop)
    * @see nsIServerSocketListener.onStopListening
    */
-  onStopListening(socket, status) {
+  onStopListening(socket) {
     dumpn(">>> shutting down server on port " + socket.port);
     for (var n in this._connections) {
       if (!this._connections[n]._requestStarted) {
@@ -4430,7 +4430,7 @@ Response.prototype = {
 
     var response = this;
     var copyObserver = {
-      onStartRequest(request) {
+      onStartRequest() {
         dumpn("*** preamble copying started");
       },
 
@@ -4488,7 +4488,7 @@ Response.prototype = {
 
     var response = this;
     var copyObserver = {
-      onStartRequest(request) {
+      onStartRequest() {
         dumpn("*** onStartRequest");
       },
 
diff --git a/netwerk/test/httpserver/test/data/sjs/range-checker.sjs b/netwerk/test/httpserver/test/data/sjs/range-checker.sjs
index 4bc447f739..b73064a568 100644
--- a/netwerk/test/httpserver/test/data/sjs/range-checker.sjs
+++ b/netwerk/test/httpserver/test/data/sjs/range-checker.sjs
@@ -1 +1 @@
-function handleRequest(request, response) {}
+function handleRequest() {}
diff --git a/netwerk/test/httpserver/test/test_body_length.js b/netwerk/test/httpserver/test/test_body_length.js
index 85f35d7441..80c548274f 100644
--- a/netwerk/test/httpserver/test/test_body_length.js
+++ b/netwerk/test/httpserver/test/test_body_length.js
@@ -22,7 +22,7 @@ function run_test() {
 
 const REQUEST_DATA = "12345678901234567";
 
-function contentLength(request, response) {
+function contentLength(request) {
   Assert.equal(request.method, "POST");
   Assert.equal(request.getHeader("Content-Length"), "017");
 
diff --git a/netwerk/test/httpserver/test/test_errorhandler_exception.js b/netwerk/test/httpserver/test/test_errorhandler_exception.js
index e9cdb0bf4f..5167ed23a8 100644
--- a/netwerk/test/httpserver/test/test_errorhandler_exception.js
+++ b/netwerk/test/httpserver/test/test_errorhandler_exception.js
@@ -78,18 +78,18 @@ function start_multiple_exceptions_500(ch) {
   checkStatusLine(ch, 1, 1, 500, "Internal Server Error");
 }
 
-function succeeded(ch, status, data) {
+function succeeded(ch, status) {
   Assert.ok(Components.isSuccessCode(status));
 }
 
-function register400Handler(ch) {
+function register400Handler() {
   srv.registerErrorHandler(400, throwsException);
 }
 
 // PATH HANDLERS
 
 // /throws/exception (and also a 404 and 400 error handler)
-function throwsException(metadata, response) {
+function throwsException() {
   throw new Error("this shouldn't cause an exit...");
   do_throw("Not reached!"); // eslint-disable-line no-unreachable
 }
diff --git a/netwerk/test/httpserver/test/test_processasync.js b/netwerk/test/httpserver/test/test_processasync.js
index 321c9b086f..d652860a25 100644
--- a/netwerk/test/httpserver/test/test_processasync.js
+++ b/netwerk/test/httpserver/test/test_processasync.js
@@ -181,7 +181,7 @@ handlers["/handleAsync2"] = handleAsync2;
 
 var startTime_handleAsync2;
 
-function init_handleAsync2(ch) {
+function init_handleAsync2() {
   var now = (startTime_handleAsync2 = Date.now());
   dumpn("*** init_HandleAsync2: start time " + now);
 }
diff --git a/netwerk/test/httpserver/test/test_setindexhandler.js b/netwerk/test/httpserver/test/test_setindexhandler.js
index e65f565673..644edd404b 100644
--- a/netwerk/test/httpserver/test/test_setindexhandler.js
+++ b/netwerk/test/httpserver/test/test_setindexhandler.js
@@ -44,7 +44,7 @@ function stopCustomIndexHandler(ch, status, data) {
 function startDefaultIndexHandler(ch) {
   Assert.equal(ch.responseStatus, 200);
 }
-function stopDefaultIndexHandler(ch, status, data) {
+function stopDefaultIndexHandler(ch, status) {
   Assert.ok(Components.isSuccessCode(status));
 }
 
diff --git a/netwerk/test/httpserver/test/test_setstatusline.js b/netwerk/test/httpserver/test/test_setstatusline.js
index f9cc189a68..b4749fd8e5 100644
--- a/netwerk/test/httpserver/test/test_setstatusline.js
+++ b/netwerk/test/httpserver/test/test_setstatusline.js
@@ -69,11 +69,11 @@ ChromeUtils.defineLazyGetter(this, "tests", function () {
 });
 
 // /no/setstatusline
-function noSetstatusline(metadata, response) {}
+function noSetstatusline() {}
 function startNoSetStatusLine(ch) {
   checkStatusLine(ch, 1, 1, 200, "OK");
 }
-function stop(ch, status, data) {
+function stop(ch, status) {
   Assert.ok(Components.isSuccessCode(status));
 }
 
diff --git a/netwerk/test/httpserver/test/test_sjs.js b/netwerk/test/httpserver/test/test_sjs.js
index 51d92ec4e0..71d04f8727 100644
--- a/netwerk/test/httpserver/test/test_sjs.js
+++ b/netwerk/test/httpserver/test/test_sjs.js
@@ -210,7 +210,7 @@ tests.push(test);
 // extension of the file on the server, not by the extension of the requested
 // path.
 
-function setupFileMapping(ch) {
+function setupFileMapping() {
   srv.registerFile("/script.html", sjs);
 }
 
diff --git a/netwerk/test/httpserver/test/test_sjs_object_state.js b/netwerk/test/httpserver/test/test_sjs_object_state.js
index 30c1e5c064..42402a8716 100644
--- a/netwerk/test/httpserver/test/test_sjs_object_state.js
+++ b/netwerk/test/httpserver/test/test_sjs_object_state.js
@@ -56,7 +56,7 @@ function run_test() {
  */
 
 var initialStarted = false;
-function initialStart(ch) {
+function initialStart() {
   dumpn("*** initialStart");
 
   if (initialStarted) {
@@ -106,7 +106,7 @@ function initialStop(ch, status, data) {
 }
 
 var intermediateStarted = false;
-function intermediateStart(ch) {
+function intermediateStart() {
   dumpn("*** intermediateStart");
 
   Assert.notEqual(srv.getObjectState("object-state-test"), null);
@@ -152,7 +152,7 @@ function intermediateStop(ch, status, data) {
 }
 
 var triggerStarted = false;
-function triggerStart(ch) {
+function triggerStart() {
   dumpn("*** triggerStart");
 
   if (!initialStarted) {