corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 544097 - Change mochitests to use mochi.test instead of localhost for mobile test refactoring p=jmaher, r=sayrer,dwitte

Browse Source
This commit is contained in:
Joel Maher
2010-03-07 16:08:05 -08:00
parent 25b9e786f0
commit b51e4506cb
202 changed files with 667 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
netwerk/test/httpserver/httpd.js
View File

@@ -501,6 +501,11 @@ nsHttpServer.prototype =
// see nsIHttpServer.start
//
start: function(port)
{
this._start(port, "localhost")
},
_start: function(port, host)
{
if (this._socket)
throw Cr.NS_ERROR_ALREADY_INITIALIZED;
@@ -508,6 +513,8 @@ nsHttpServer.prototype =
this._port = port;
this._doQuit = this._socketClosed = false;
this._host = host;
// The listen queue needs to be long enough to handle
// network.http.max-connections-per-server concurrent connections,
// plus a safety margin in case some other process is talking to
@@ -518,13 +525,18 @@ nsHttpServer.prototype =
try
{
var loopback = true;
if (this._host != "127.0.0.1" && this._host != "localhost") {
var loopback = false;
}
var socket = new ServerSocket(this._port,
true, // loopback only
loopback, // true = localhost, false = everybody
maxConnections);
dumpn(">>> listening on port " + socket.port + ", " + maxConnections +
" pending connections");
socket.asyncListen(this);
this._identity._initialize(port, true);
this._identity._initialize(port, host, true);
this._socket = socket;
}
catch (e)
@@ -921,7 +933,7 @@ ServerIdentity.prototype =
// Always keep at least one identity in existence at any time, unless
// we're in the process of shutting down (the last condition above).
this._primaryPort = -1;
this._initialize(this._defaultPort, false);
this._initialize(this._defaultPort, host, false);
}
return present;
@@ -987,16 +999,17 @@ ServerIdentity.prototype =
* Initializes the primary name for the corresponding server, based on the
* provided port number.
*/
_initialize: function(port, addSecondaryDefault)
_initialize: function(port, host, addSecondaryDefault)
{
this._host = host;
if (this._primaryPort !== -1)
this.add("http", "localhost", port);
this.add("http", host, port);
else
this.setPrimary("http", "localhost", port);
this._defaultPort = port;
// Only add this if we're being called at server startup
if (addSecondaryDefault)
if (addSecondaryDefault && host != "127.0.0.1")
this.add("http", "127.0.0.1", port);
},
@@ -1007,20 +1020,22 @@ ServerIdentity.prototype =
*/
_teardown: function()
{
// Not the default primary location, nothing special to do here
this.remove("http", "127.0.0.1", this._defaultPort);
if (this._host != "127.0.0.1") {
// Not the default primary location, nothing special to do here
this.remove("http", "127.0.0.1", this._defaultPort);
}
// This is a *very* tricky bit of reasoning here; make absolutely sure the
// tests for this code pass before you commit changes to it.
if (this._primaryScheme == "http" &&
this._primaryHost == "localhost" &&
this._primaryHost == this._host &&
this._primaryPort == this._defaultPort)
{
// Make sure we don't trigger the readding logic in .remove(), then remove
// the default location.
var port = this._defaultPort;
this._defaultPort = -1;
this.remove("http", "localhost", port);
this.remove("http", this._host, port);
// Ensure a server start triggers the setPrimary() path in ._initialize()
this._primaryPort = -1;
@@ -1028,7 +1043,7 @@ ServerIdentity.prototype =
else
{
// No reason not to remove directly as it's not our primary location
this.remove("http", "localhost", this._defaultPort);
this.remove("http", this._host, this._defaultPort);
}
},