Merge branch 'master' of github.com:JacksonTian/ping

JacksonTian · Dec 10, 2011 · 5463b7b · 5463b7b
2 parents e68f077 + 811ca2c
commit 5463b7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,7 @@
-Hello, Ping.
+#Hello, Ping.
+
+##静态文件服务器部分
+[用Node.js打造你的静态文件服务器](http://cnodejs.org/blog/?p=3904)
+
+##动态文件服务器部分
+[用Node.js构建动态服务器基础](http://cnodejs.org/blog/?p=4520)
diff --git a/ping.js b/ping.js
@@ -2,8 +2,8 @@ var http = require("http");
 var https = require("https");
 var config = require("./config");
 
-exports.createServer = function (framework) {
-    var options = config.secure;
+exports.createServer = function (framework, options) {
+    options = options || config.secure;
     var server = options ? https.createServer(options) : http.createServer();
     server.on("request", function (request, response) {
         framework.dispatch(request, response);