Merge pull request hapijs#424 from wpreul/feature/address

Eran Hammer · Eran Hammer · commit ffabc334b843 · 2013-01-29T10:44:15.000-08:00
Server uri isn't set until after server is started and now using node host
diff --git a/lib/server.js b/lib/server.js
@@ -58,10 +58,13 @@ module.exports = internals.Server = function (/* host, port, options */) {
 
     this._started = false;
     this.settings = Utils.applyToDefaults(Defaults.server, args.options);
-    this.settings.host = args.host ? args.host.toLowerCase() : 'localhost';
+    this.settings.host = args.host ? args.host.toLowerCase() : '0.0.0.0';
     this.settings.port = typeof args.port !== 'undefined' ? args.port : (this.settings.tls ? 443 : 80);
-    this.settings.nickname = this.settings.host + ':' + this.settings.port;
-    this.settings.uri = (this.settings.tls ? 'https://' : 'http://') + this.settings.host + ':' + this.settings.port;
+
+    if (this.settings.port) {
+        this.settings.nickname = this.settings.host + ':' + this.settings.port;
+        this.settings.uri = (this.settings.tls ? 'https://' : 'http://') + this.settings.host + ':' + this.settings.port;
+    }
 
     // Set optional configuration
     // false -> null, true -> defaults, {} -> override defaults
@@ -295,7 +298,10 @@ internals.Server.prototype.start = function (callback) {
     this.listener.once('listening', function () {
 
         // update the port and uri with what was actually bound
-        self.settings.port = self.listener.address().port;
+        var address = self.listener.address();
+        self.settings.port = address.port;
+        self.settings.host = self.settings.host || address.address;
+        self.settings.nickname = self.settings.host + ':' + self.settings.port;
         self.settings.uri = (self.settings.tls ? 'https://' : 'http://') + self.settings.host + ':' + self.settings.port;
 
         Log.event('info', self.settings.nickname + ': Instance started at ' + self.settings.uri);
diff --git a/test/integration/response.js b/test/integration/response.js
@@ -1177,16 +1177,21 @@ describe('Response', function () {
             }
         };
 
-        var server = new Hapi.Server();
+        var server = new Hapi.Server(0);
         server.addRoute({ method: 'GET', path: '/redirect', config: { handler: handler } });
 
+        before(function (done) {
+
+            server.start(done);
+        });
+
         it('returns a redirection reply', function (done) {
 
             server.inject({ method: 'GET', url: '/redirect' }, function (res) {
 
                 expect(res.result).to.exist;
                 expect(res.result).to.equal('You are being redirected...');
-                expect(res.headers['Location']).to.equal('http://localhost:80/example');
+                expect(res.headers['Location']).to.equal(server.settings.uri + '/example');
                 expect(res.statusCode).to.equal(302);
                 done();
             });
@@ -1198,7 +1203,7 @@ describe('Response', function () {
 
                 expect(res.result).to.exist;
                 expect(res.result).to.equal('We moved!');
-                expect(res.headers['Location']).to.equal('http://localhost:80/examplex');
+                expect(res.headers['Location']).to.equal(server.settings.uri + '/examplex');
                 expect(res.statusCode).to.equal(302);
                 done();
             });
diff --git a/test/unit/server.js b/test/unit/server.js
@@ -48,11 +48,14 @@ describe('Server', function () {
         done();
     });
 
-    it('defaults to localhost when no host is provided', function (done) {
+    it('defaults to 0.0.0.0 when no host is provided', function (done) {
 
-        var server = new Hapi.Server();
-        expect(server.settings.host).to.be.equal('localhost');
-        done();
+        var server = new Hapi.Server(0);
+        server.start(function () {
+
+            expect(server.settings.host).to.be.equal('0.0.0.0');
+            done();
+        });
     });
 
     it('doesn\'t throw an error when host and port are provided', function (done) {
