Commit a68eff59 by Sheng

Added attribute custom_headers to MixinHandler

parent af60cd1c
...@@ -586,22 +586,30 @@ class TestAppWithTrustedStream(OtherTestBase): ...@@ -586,22 +586,30 @@ class TestAppWithTrustedStream(OtherTestBase):
class TestAppNotFoundHandler(OtherTestBase): class TestAppNotFoundHandler(OtherTestBase):
custom_headers = handler.MixinHandler.custom_headers
def test_with_not_found_get_request(self): def test_with_not_found_get_request(self):
response = self.fetch('/pathnotfound', method='GET') response = self.fetch('/pathnotfound', method='GET')
self.assertEqual(response.code, 404) self.assertEqual(response.code, 404)
self.assertEqual(response.headers['Server'], 'TornadoServer') self.assertEqual(
response.headers['Server'], self.custom_headers['Server']
)
self.assertIn(b'404: Not Found', response.body) self.assertIn(b'404: Not Found', response.body)
def test_with_not_found_post_request(self): def test_with_not_found_post_request(self):
response = self.fetch('/pathnotfound', method='POST', response = self.fetch('/pathnotfound', method='POST',
body=urlencode(self.body), headers=self.headers) body=urlencode(self.body), headers=self.headers)
self.assertEqual(response.code, 404) self.assertEqual(response.code, 404)
self.assertEqual(response.headers['Server'], 'TornadoServer') self.assertEqual(
response.headers['Server'], self.custom_headers['Server']
)
self.assertIn(b'404: Not Found', response.body) self.assertIn(b'404: Not Found', response.body)
def test_with_not_found_put_request(self): def test_with_not_found_put_request(self):
response = self.fetch('/pathnotfound', method='PUT', response = self.fetch('/pathnotfound', method='PUT',
body=urlencode(self.body), headers=self.headers) body=urlencode(self.body), headers=self.headers)
self.assertEqual(response.code, 404) self.assertEqual(response.code, 404)
self.assertEqual(response.headers['Server'], 'TornadoServer') self.assertEqual(
response.headers['Server'], self.custom_headers['Server']
)
self.assertIn(b'404: Not Found', response.body) self.assertIn(b'404: Not Found', response.body)
...@@ -39,6 +39,10 @@ class InvalidValueError(Exception): ...@@ -39,6 +39,10 @@ class InvalidValueError(Exception):
class MixinHandler(object): class MixinHandler(object):
custom_headers = {
'Server': 'TornadoServer'
}
def prepare(self): def prepare(self):
if self.is_forbidden(): if self.is_forbidden():
raise tornado.web.HTTPError(403) raise tornado.web.HTTPError(403)
...@@ -66,7 +70,8 @@ class MixinHandler(object): ...@@ -66,7 +70,8 @@ class MixinHandler(object):
return True return True
def set_default_headers(self): def set_default_headers(self):
self.set_header('Server', 'TornadoServer') for header in self.custom_headers.items():
self.set_header(*header)
def get_value(self, name): def get_value(self, name):
value = self.get_argument(name) value = self.get_argument(name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment