Merge branch 'route-http-client-security'

expressjs · Feb 12, 2010 · 49cb53d · 49cb53d
2 parents c6a2674 + 54f1a51
commit 49cb53d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/express/core.js b/lib/express/core.js
@@ -201,6 +201,7 @@ Server = Class({
 
   run: function(port, host, backlog){
     var self = this
+    this.running = true
     if (host !== undefined) this.host = host
     if (port !== undefined) this.port = port
     if (backlog !== undefined) this.backlog = backlog

diff --git a/lib/express/dsl.js b/lib/express/dsl.js
@@ -21,8 +21,10 @@ function route(method) {
       fn = options, options = {}
     if (path.indexOf('http://') === 0)
       return http[method].apply(this, arguments)
-    else
+    else if (!Express.server.running)
       Express.routes.push(new Route(method, path, fn, options))
+    else
+      throw new Error('cannot create route ' + method.toUpperCase() + " `" + path + "' at runtime")
   }
 }