Skip to content

Fix request auto headers#1205

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
lovelydinosaur merged 3 commits into from
Aug 21, 2020
Merged

Fix request auto headers #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c958ac
Failing test case
lovelydinosaur Aug 20, 2020
4102a56
Fix auto_headers in Request.prepare()
lovelydinosaur Aug 20, 2020
672842b
Merge branch 'master' into fix-request-auto-headers
florimondmanca Aug 21, 2020
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
6 changes: 2 additions & 4 deletions httpx/_models.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -411,9 +411,8 @@ def encoding(self, value: str) -> None:
def raw(self) -> typing.List[typing.Tuple[bytes, bytes]]:
"""
Returns a list of the raw header items, as byte pairs.
May be mutated in-place.
"""
return self._list
return list(self._list)

def keys(self) -> typing.KeysView[str]:
return {key.decode(self.encoding): None for key in self._dict.keys()}.keys()
Expand DownExpand Up@@ -647,8 +646,7 @@ def prepare(self) -> None:
if not has_connection:
auto_headers.append((b"connection", b"keep-alive"))

for item in reversed(auto_headers):
self.headers.raw.insert(0, item)
self.headers = Headers(auto_headers + self.headers.raw)

@property
def content(self) -> bytes:
Expand Down
7 changes: 6 additions & 1 deletion tests/client/test_headers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@
import httpcore
import pytest

from httpx import AsyncClient, Headers, __version__
from httpx import AsyncClient, Headers, Request, __version__
from httpx._content_streams import ContentStream, JSONStream


Expand DownExpand Up@@ -181,3 +181,8 @@ async def test_host_with_non_default_port_in_url():
"authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
}
}


def test_request_auto_headers():
request = Request("GET", "https://www.example.org/")
assert "host" in request.headers