Permalink
Browse files

Update lib/method.js

  • Loading branch information...
1 parent 70f7aff commit fbb6b7c8497efc3074ddedf00c1038bc5613e6c6 @iwillwen committed Dec 1, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 lib/method.js
View
@@ -8,21 +8,21 @@ var https = require('https');
var http = require('http');
var dataStream = require('dataStream');
var eventproxy = require('eventproxy').EventProxy;
-<<<<<<< HEAD
+<<<<<<< HEAD
var asynclist = require('asynclist');
-=======
->>>>>>> 33201c1a7bddcdf11d2891678ab2f9d1a0dfc163
+=======
+>>>>>>> 33201c1a7bddcdf11d2891678ab2f9d1a0dfc163
var url = require('url');
var utils = require('./utils');
var middlewares = ['basicAuth', 'bodyParser', 'cookieParser', 'cookieSession', 'csrf', 'directory', 'errorHandler', 'favicon', 'json', 'limit', 'logger', 'methodOverride', 'multipart', 'query', 'responseTime', 'session', 'staticCache', 'urlencoded', 'vhost'];
function method (web) {
//Method
-<<<<<<< HEAD
+<<<<<<< HEAD
web.version = '0.5.9';
-=======
+=======
web.version = '0.5.8';
->>>>>>> 33201c1a7bddcdf11d2891678ab2f9d1a0dfc163
+>>>>>>> 33201c1a7bddcdf11d2891678ab2f9d1a0dfc163
/**
* return a middlewaves collection iterator.
@@ -285,7 +285,7 @@ function method (web) {
*/
web.run = function (port, host) {
port = port || 80;
- host = host || '127.0.0.1';
+ host = host || '0.0.0.0';
var server = connect.createServer();
server.setRouter = false;
server.self = server.listen(port, host);
@@ -302,8 +302,8 @@ function method (web) {
* @param {String} host Domain to listen.(require) 监听的域名*
*/
web.runHttps = function (opt, port, host) {
- port = port || 80;
- host = host || '127.0.0.1';
+ port = port || 443;
+ host = host || '0.0.0.0';
var server = connect.createServer();
var httpsServer = https.createServer(opt, server);
server.setRouter = false;

0 comments on commit fbb6b7c

Please sign in to comment.