Merge branch '1.x' into 2.x

This commit is contained in:
AJ ONeal 2016-10-06 22:28:19 -06:00
commit 8211a530df
1 changed files with 2 additions and 1 deletions

View File

@ -144,6 +144,7 @@ function createServer(port, pubdir, content, opts) {
if ('false' !== opts.insecurePort && httpPort !== opts.insecurePort) {
return createInsecureServer(opts.insecurePort, pubdir, opts).then(resolve);
} else {
opts.insecurePort = opts.port;
resolve();
}
});
@ -358,8 +359,8 @@ function run() {
if (!matchingIps.length) {
console.info("Neither the attached nor external interfaces match '" + argv.servername + "'");
}
opts.matchingIps = matchingIps || [];
}
opts.matchingIps = matchingIps || [];
if (opts.matchingIps.length) {
console.info('');