Mercurial Mercurial > pub > hg > cubicweb / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
web/request.py
branchstable
changeset 7858 f91255a3b2c2
parent 7855 54283a5b7afc
child 7868 39a54b88906d
child 7870 1a1e04163cde 
--- 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:
cubicweb