diff options
| author | Jack Wearden <jack@jackwearden.co.uk> | 2018-05-21 14:03:33 -0700 |
|---|---|---|
| committer | Jack Wearden <jack@jackwearden.co.uk> | 2018-05-21 14:03:33 -0700 |
| commit | 8c1c2405a34154cccf436811e4179e7f444d7d8f (patch) | |
| tree | c8cca82fd0d4615c0f6d90665b6ade742cf60a5a | |
| parent | 2544704f78119b79e5f6124e467567bfe1b60645 (diff) | |
| download | waitress-8c1c2405a34154cccf436811e4179e7f444d7d8f.tar.gz | |
No empty Via on proxied requests
| -rw-r--r-- | waitress/adjustments.py | 2 | ||||
| -rw-r--r-- | waitress/task.py | 2 | ||||
| -rw-r--r-- | waitress/tests/test_adjustments.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/waitress/adjustments.py b/waitress/adjustments.py index 9b8ac1a..c55823a 100644 --- a/waitress/adjustments.py +++ b/waitress/adjustments.py @@ -67,7 +67,7 @@ def slash_fixed_str(s): return s def str_iftruthy(s): - return str(s) if s else s + return str(s) if s else None class _str_marker(str): pass diff --git a/waitress/task.py b/waitress/task.py index 17483a0..8b0856a 100644 --- a/waitress/task.py +++ b/waitress/task.py @@ -254,7 +254,7 @@ class Task(object): if ident: response_headers.append(('Server', ident)) else: - response_headers.append(('Via', ident)) + response_headers.append(('Via', ident or 'waitress')) if not date_header: response_headers.append(('Date', build_http_date(self.start_time))) diff --git a/waitress/tests/test_adjustments.py b/waitress/tests/test_adjustments.py index 4b0a991..09c60ef 100644 --- a/waitress/tests/test_adjustments.py +++ b/waitress/tests/test_adjustments.py @@ -224,7 +224,7 @@ class TestAdjustments(unittest.TestCase): self.assertEqual(inst.ident, None) inst = self._makeOne(ident='') - self.assertEqual(inst.ident, '') + self.assertEqual(inst.ident, None) inst = self._makeOne(ident='specific_header') self.assertEqual(inst.ident, 'specific_header') |