Skip to content

Commit e68796e

Browse files
authored
Merge pull request #728 from http-party/fix-o-on-windows
open to 127.0.0.1 when host is 0.0.0.0
2 parents 9577eae + 7113dab commit e68796e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

bin/http-server

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ function listen(port) {
163163

164164
var server = httpServer.createServer(options);
165165
server.listen(port, host, function () {
166-
var canonicalHost = host,
167-
protocol = ssl ? 'https://' : 'http://';
166+
var protocol = ssl ? 'https://' : 'http://';
168167

169168
logger.info([colors.yellow('Starting up http-server, serving '),
170169
colors.cyan(server.root),
@@ -185,9 +184,8 @@ function listen(port) {
185184
logger.info(colors.yellow('\nAvailable on:'));
186185

187186
if (argv.a && host !== '0.0.0.0') {
188-
logger.info((' ' + protocol + canonicalHost + ':' + colors.green(port.toString())));
189-
}
190-
else {
187+
logger.info(` ${protocol}${host}:${colors.green(port.toString())}`);
188+
} else {
191189
Object.keys(ifaces).forEach(function (dev) {
192190
ifaces[dev].forEach(function (details) {
193191
if (details.family === 'IPv4') {
@@ -203,13 +201,17 @@ function listen(port) {
203201

204202
logger.info('Hit CTRL-C to stop the server');
205203
if (argv.o) {
206-
var openUrl = protocol + canonicalHost + ':' + port;
204+
const openHost = host === '0.0.0.0' ? '127.0.0.1' : host;
205+
let openUrl = `${protocol}${openHost}:${port}`;
207206
if (typeof argv.o === 'string') {
208207
openUrl += argv.o[0] === '/' ? argv.o : '/' + argv.o;
209208
}
210-
logger.info('open: ' + openUrl);
209+
logger.info('Open: ' + openUrl);
211210
opener(openUrl);
212211
}
212+
213+
// Spacing before logs
214+
if (!argv.s) logger.info();
213215
});
214216
}
215217

0 commit comments

Comments
 (0)