Merge branch 'origin/dev'

2014-03-29 01:00:51 -07:00 · 2014-03-29 01:00:51 -07:00 · b571e369fa
parent 9cbef9a1b3 c309e8afc9
commit b571e369fa
1 changed files with 1 additions and 1 deletions
--- a/lib/cachecontrol/controller.py
+++ b/lib/cachecontrol/controller.py
@ -191,7 +191,7 @@ class CacheController(object):
            return

        if self.sess.cache_auto and ('cache-control' not in resp.headers or 'Cache-Control' not in resp.headers):
-            cache_max_age = int(self.sess.cache_max_age) or 900
+            cache_max_age = int(self.sess.cache_max_age or 900)
            headers = {'Cache-Control': 'public,max-age=%d' % int(cache_max_age)}
            resp.headers.update(headers)