Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,15 @@ function session(options){
return false;
}

var _finished = res.finished;
res.finished = true;
ended = true;

var ret;
var sync = true;

function writeend() {
res.finished = _finished;
if (sync) {
ret = _end.call(res, chunk, encoding);
sync = false;
Expand Down Expand Up @@ -262,6 +265,8 @@ function session(options){
// no session to save
if (!req.session) {
debug('no session');

res.finished = _finished;
return _end.call(res, chunk, encoding);
}

Expand All @@ -280,6 +285,7 @@ function session(options){
return writetop();
}

res.finished = _finished;
return _end.call(res, chunk, encoding);
};

Expand Down
20 changes: 19 additions & 1 deletion test/session.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

process.env.NO_DEPRECATION = 'express-session';

var after = require('after')
Expand Down Expand Up @@ -349,6 +348,25 @@ describe('session()', function(){
done()
})
})

it('should finish response', function(done) {
var finished = false;
var store = new session.MemoryStore()
var server = createServer({ store: store }, function (req, res) {
req.session.hit = true
res.write('hello, ')
res.end('world')
finished = res.finished
})

request(server)
.get('/')
.expect(200, 'hello, world', function(err) {
if (err) return done(err)
finished.should.be.true
done()
})
})
})

describe('when sid not in store', function () {
Expand Down