Fixed vhost() middleware. Closes #494

lib/middleware/vhost.js

@@ -1,3 +1,4 @@
+
 /*!
  * Connect - vhost
  * Copyright(c) 2010 Sencha Inc.
@@ -15,6 +16,9 @@
  *       .use(connect.vhost('bar.com', barApp))
  *       .use(connect.vhost('*.com', mainApp))
  *
+ *  The `server` may be a Connect server or
+ *  a regular Node `http.Server`. 
+ *
  * @param {String} hostname
  * @param {Server} server
  * @return {Function}
@@ -29,11 +33,8 @@ module.exports = function vhost(hostname, server){
   return function vhost(req, res, next){
     if (!req.headers.host) return next();
     var host = req.headers.host.split(':')[0];
-    if (req.subdomains = regexp.exec(host)) {
-      req.subdomains = req.subdomains[0].split('.').slice(0, -1);
-      server.emit('request', req, res);
-    } else {
-      next();
-    }
+    if (!regexp.test(host)) return next();
+    if ('function' == typeof server) return server(req, res, next);
+    server.emit('request', req, res);
   };
 };