mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'feature/support-node-0.10' into develop

Browse source 
Conflicts:
	src/package.json
This commit is contained in:
Marcel Klehr 2013-04-01 13:29:07 +02:00
commit 04a53c4402
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/db/SessionStore.js
View file

@ -22,7 +22,7 @@ SessionStore.prototype.get = function(sid, fn){
{
if (sess) {
sess.cookie.expires = 'string' == typeof sess.cookie.expires ? new Date(sess.cookie.expires) : sess.cookie.expires;
if (!sess.cookie.expires || new Date() < expires) {
if (!sess.cookie.expires || new Date() < sess.cookie.expires) {
fn(null, sess);
} else {
self.destroy(sid, fn);