Permalink
Browse files

Merge branch 'master' of github.com:visionmedia/express

  • Loading branch information...
2 parents 72b9e48 + cb75184 commit 1c616e29e22ca1a41d6079214f1f7aaa1b86fa17 TJ Holowaychuk committed Nov 8, 2012
Showing with 3 additions and 9 deletions.
  1. +1 −0 .gitignore
  2. +0 −4 Readme.md
  3. +2 −4 lib/application.js
  4. +0 −1 lib/response.js
View
@@ -16,3 +16,4 @@ testing
.coverage_data
cover_html
test.js
+.idea
View
@@ -17,10 +17,6 @@ app.listen(3000);
$ npm install -g express
- To install the 3.0 alpha:
-
- $ npm install -g express@3.0
-
## Quick Start
The quickest way to get started with express is to utilize the executable `express(1)` to generate an application as shown below:
View
@@ -45,8 +45,6 @@ app.init = function(){
*/
app.defaultConfiguration = function(){
- var self = this;
-
// default settings
this.enable('x-powered-by');
this.set('env', process.env.NODE_ENV || 'development');
@@ -103,7 +101,7 @@ app.defaultConfiguration = function(){
*/
app.use = function(route, fn){
- var app, handle;
+ var app;
// default route to '/'
if ('string' != typeof route) fn = route, route = '/';
@@ -404,7 +402,7 @@ app.configure = function(env, fn){
methods.forEach(function(method){
app[method] = function(path){
- if ('get' == method && 1 == arguments.length) return this.set(path);
+ if ('get' == method && 1 == arguments.length) return this.set(path);
var args = [method].concat([].slice.call(arguments));
if (!this._usedRouter) this.use(this.router);
this._router.route.apply(this._router, args);
View
@@ -11,7 +11,6 @@ var http = require('http')
, normalizeTypes = require('./utils').normalizeTypes
, etag = require('./utils').etag
, statusCodes = http.STATUS_CODES
- , send = connect.static.send
, cookie = require('cookie')
, send = require('send')
, mime = connect.mime

0 comments on commit 1c616e2

Please sign in to comment.