Skip to content

Fix #216: HttpMessage._add_default_headers does not overwrite existing headers #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asvetlov merged 2 commits into from
Jan 2, 2015
+20 −11
Merged

Fix #216: HttpMessage._add_default_headers does not overwrite existing headers #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd2b027
Fix #216: HttpMessage._add_default_headers does not overwrite existin…
asvetlov Jan 2, 2015
8718e57
Don't calculate format_date_time(None) when doesn't need
asvetlov Jan 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions aiohttp/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,8 +521,6 @@ class HttpMessage:
# this is useful for wsgi's start_response implementation.
_send_headers = False

_has_user_agent = False

def __init__(self, transport, version, close):
self.transport = transport
self.version = version
Expand Down Expand Up @@ -595,9 +593,6 @@ def add_header(self, name, value):
self.chunked = value.lower().strip() == 'chunked'

elif name not in self.HOP_HEADERS:
if name == 'USER-AGENT':
self._has_user_agent = True

# ignore hop-by-hop headers
self.headers.add(name, value)

Expand Down Expand Up @@ -805,8 +800,6 @@ class Response(HttpMessage):
'TRAILERS',
'TRANSFER-ENCODING',
'UPGRADE',
'SERVER',
'DATE',
}

@staticmethod
Expand All @@ -833,8 +826,10 @@ def __init__(self, transport, status,
def _add_default_headers(self):
super()._add_default_headers()

self.headers.extend((('DATE', format_date_time(None)),
('SERVER', self.SERVER_SOFTWARE),))
if 'DATE' not in self.headers:
# format_date_time(None) is quite expensive
self.headers.setdefault('DATE', format_date_time(None))
self.headers.setdefault('SERVER', self.SERVER_SOFTWARE)


class Request(HttpMessage):
Expand All @@ -853,5 +848,4 @@ def __init__(self, transport, method, path,
def _add_default_headers(self):
super()._add_default_headers()

if not self._has_user_agent:
self.headers['USER-AGENT'] = self.SERVER_SOFTWARE
self.headers.setdefault('USER-AGENT', self.SERVER_SOFTWARE)
15 changes: 15 additions & 0 deletions tests/test_http_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,3 +479,18 @@ def test_write_drain(self):

res = msg.write(b'1')
self.assertEqual(res, ())

def test_dont_override_request_headers_with_default_values(self):
msg = protocol.Request(
self.transport, 'GET', '/index.html', close=True)
msg.add_header('USER-AGENT', 'custom')
msg._add_default_headers()
self.assertEqual('custom', msg.headers['USER-AGENT'])

def test_dont_override_response_headers_with_default_values(self):
msg = protocol.Response(self.transport, 200, http_version=(1, 0))
msg.add_header('DATE', 'now')
msg.add_header('SERVER', 'custom')
msg._add_default_headers()
self.assertEqual('custom', msg.headers['SERVER'])
self.assertEqual('now', msg.headers['DATE'])