Merge branch 'master' into alexcrichton-master

mitio · Jun 1, 2011 · 7a1ad7b · 7a1ad7b
2 parents 2c73a94 + 8de33e0
commit 7a1ad7b
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 86 deletions.
diff --git a/lib/client.js b/lib/client.js
diff --git a/lib/pool.js b/lib/pool.js
diff --git a/lib/process.js b/lib/process.js
diff --git a/lib/server.js b/lib/server.js
@@ -4,21 +4,9 @@
   createPool = require('./pool').createPool;
   exports.createServer = function(config, options) {
     var pool, server, _ref, _ref2;
-        if (options != null) {
-      options;
-    } else {
-      options = {};
-    };
-        if ((_ref = options.size) != null) {
-      _ref;
-    } else {
-      options.size = 3;
-    };
-        if ((_ref2 = options.idle) != null) {
-      _ref2;
-    } else {
-      options.idle = 15 * 60 * 1000;
-    };
+    options != null ? options : options = {};
+    (_ref = options.size) != null ? _ref : options.size = 3;
+    (_ref2 = options.idle) != null ? _ref2 : options.idle = 15 * 60 * 1000;
     pool = createPool(config, options);
     server = createServer(pool.proxy);
     server.on('close', function() {

diff --git a/lib/util.js b/lib/util.js