Merge branch '1.x' into 2.x
This commit is contained in:
commit
8211a530df
3
serve.js
3
serve.js
|
@ -144,6 +144,7 @@ function createServer(port, pubdir, content, opts) {
|
||||||
if ('false' !== opts.insecurePort && httpPort !== opts.insecurePort) {
|
if ('false' !== opts.insecurePort && httpPort !== opts.insecurePort) {
|
||||||
return createInsecureServer(opts.insecurePort, pubdir, opts).then(resolve);
|
return createInsecureServer(opts.insecurePort, pubdir, opts).then(resolve);
|
||||||
} else {
|
} else {
|
||||||
|
opts.insecurePort = opts.port;
|
||||||
resolve();
|
resolve();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -358,8 +359,8 @@ function run() {
|
||||||
if (!matchingIps.length) {
|
if (!matchingIps.length) {
|
||||||
console.info("Neither the attached nor external interfaces match '" + argv.servername + "'");
|
console.info("Neither the attached nor external interfaces match '" + argv.servername + "'");
|
||||||
}
|
}
|
||||||
opts.matchingIps = matchingIps || [];
|
|
||||||
}
|
}
|
||||||
|
opts.matchingIps = matchingIps || [];
|
||||||
|
|
||||||
if (opts.matchingIps.length) {
|
if (opts.matchingIps.length) {
|
||||||
console.info('');
|
console.info('');
|
||||||
|
|
Loading…
Reference in New Issue