diff options
| -rwxr-xr-x | tests/test_scheduler.py | 3 | ||||
| -rw-r--r-- | zuul/webapp.py | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index b44dba6c1..5712d7c6a 100755 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -2120,7 +2120,10 @@ class TestScheduler(ZuulTestCase): self.assertIn('Content-Type', headers) self.assertEqual(headers['Content-Type'], 'application/json; charset=UTF-8') + self.assertIn('Access-Control-Allow-Origin', headers) + self.assertIn('Cache-Control', headers) self.assertIn('Last-Modified', headers) + self.assertIn('Expires', headers) data = f.read() self.worker.hold_jobs_in_build = False diff --git a/zuul/webapp.py b/zuul/webapp.py index e289398ac..44c333bf9 100644 --- a/zuul/webapp.py +++ b/zuul/webapp.py @@ -121,5 +121,10 @@ class WebApp(threading.Thread): raise webob.exc.HTTPNotFound() response.headers['Access-Control-Allow-Origin'] = '*' + + response.cache_control.public = True + response.cache_control.max_age = self.cache_expiry response.last_modified = self.cache_time - return response + response.expires = self.cache_time + self.cache_expiry + + return response.conditional_response_app |