diff -r 51a3fb272bf3 -r f91255a3b2c2 web/request.py --- a/web/request.py Tue Jun 07 11:42:08 2011 +0200 +++ b/web/request.py Mon Sep 26 17:48:48 2011 +0200 @@ -540,8 +540,8 @@ secure = name[value]['secure'] name, value = value, name[value].value if maxage: # don't check is None, 0 may be specified + assert expires is None, 'both max age and expires cant be specified' expires = maxage + time.time() - assert expires is None, 'both max age and expires cant be specified' elif expires: expires = timegm((expires + GMTOFFSET).timetuple()) else: