fix cookieSession() pathname mismatch

denofiend · Jul 5, 2012 · e1e94d3 · e1e94d3
1 parent 0e1fc87
commit e1e94d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/middleware/cookieSession.js b/lib/middleware/cookieSession.js
@@ -60,6 +60,10 @@ module.exports = function cookieSession(options){
 
     // default session
     req.session = {};
+    var cookie = req.session.cookie = new Cookie(options.cookie);
+
+    // pathname mismatch
+    if (0 != req.originalUrl.indexOf(cookie.path)) return next();
 
     // cookieParser secret
     if (!options.secret && req.secret) {
@@ -76,12 +80,7 @@ module.exports = function cookieSession(options){
       }
     }
 
-    var cookie = req.session.cookie = new Cookie(options.cookie);
-
     res.on('header', function(){
-      // pathname mismatch
-      if (0 != req.originalUrl.indexOf(cookie.path)) return;
-
       // removed
       if (!req.session) {
         debug('clear session');

diff --git a/test/cookieSession.js b/test/cookieSession.js
@@ -252,7 +252,7 @@ describe('connect.cookieSession()', function(){
     it('should not set-cookie', function(done){
       var app = connect()
         .use(connect.cookieParser())
-        .use(connect.cookieSession({ secret: 'keyboard cat',cookie: { path: '/admin' }}))
+        .use(connect.cookieSession({ secret: 'keyboard cat', cookie: { path: '/admin' }}))
         .use(function(req, res, next){
           req.session.foo = Math.random();
           res.end();