From 0d3f364aaccd459a5d0156f10b6aabfb2dc52330 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoc@gmail.com>
Date: Wed, 9 Dec 2009 13:13:04 +0000
Subject: Apply cookie date fix from adios

---
 deluge/ui/web/auth.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'deluge/ui/web/auth.py')

diff --git a/deluge/ui/web/auth.py b/deluge/ui/web/auth.py
index b32e5477d..101bc628a 100644
--- a/deluge/ui/web/auth.py
+++ b/deluge/ui/web/auth.py
@@ -51,6 +51,8 @@ import time
 import random
 import hashlib
 import logging
+from datetime import datetime, timedelta
+from email.utils import formatdate
 
 from twisted.internet.defer import Deferred
 from twisted.internet.task import LoopingCall
@@ -82,9 +84,9 @@ def get_session_id(session_id):
         return None
 
 def make_expires(timeout):
-    expires = int(time.time()) + timeout
-    expires_str = time.strftime('%a, %d %b %Y %H:%M:%S GMT',
-            time.gmtime(expires))
+    dt = timedelta(seconds=timeout)
+    expires = time.mktime((datetime.now() + dt).timetuple())
+    expires_str = formatdate(timeval=expires, localtime=False, usegmt=True)
     return expires, expires_str
 
 class Auth(JSONComponent):
-- 
cgit