Skip to content
Open
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
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ function getcookie(req, name, secrets) {

// read from cookie header
if (header) {
var cookies = cookie.parse(header);
var cookies = cookie.parseCookie(header);

raw = cookies[name];

Expand Down Expand Up @@ -611,7 +611,7 @@ function issecure(req, trustProxy) {

function setcookie(res, name, val, secret, options) {
var signed = 's:' + signature.sign(val, secret);
var data = cookie.serialize(name, signed, options);
var data = cookie.stringifySetCookie(name, signed, options);

debug('set-cookie %s', data);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"repository": "expressjs/session",
"license": "MIT",
"dependencies": {
"cookie": "0.7.2",
"cookie": "1.1.1",
"cookie-signature": "1.0.7",
"debug": "2.6.9",
"depd": "~2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion session/cookie.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Cookie.prototype = {
*/

serialize: function(name, val){
return cookie.serialize(name, val, this.data);
return cookie.stringifySetCookie(name, val, this.data);
},

/**
Expand Down
10 changes: 5 additions & 5 deletions test/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@ describe('session()', function(){

server.on('error', function onerror (err) {
assert.ok(err)
assert.strictEqual(err.message, 'option expires is invalid')
assert.strictEqual(err.message, 'option expires is invalid: Invalid Date')
cb()
})

Expand All @@ -1955,8 +1955,8 @@ describe('session()', function(){

it('should preserve cookies set before writeHead is called', function(done){
var server = createServer(null, function (req, res) {
var cookie = new Cookie()
res.setHeader('Set-Cookie', cookie.serialize('previous', 'cookieValue'))
var sessionCookie = new Cookie()
res.setHeader('Set-Cookie', sessionCookie.serialize('previous', 'cookieValue'))
res.end()
})

Expand All @@ -1968,9 +1968,9 @@ describe('session()', function(){

it('should preserve cookies set in writeHead', function (done) {
var server = createServer(null, function (req, res) {
var cookie = new Cookie()
var sessionCookie = new Cookie()
res.writeHead(200, {
'Set-Cookie': cookie.serialize('previous', 'cookieValue')
'Set-Cookie': sessionCookie.serialize('previous', 'cookieValue')
})
res.end()
})
Expand Down
Loading