Skip to content

Keep the request method across a trailers block so the HEAD exemption still applies #1331

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

Open
feiiiiii5 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep the request method across a trailers block so the HEAD exemption still applies #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/h2/stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,9 @@ def send_headers(self,
self._authority = authority_from_headers(bytes_headers)

# store request method for _initialize_content_length
self.request_method = extract_method_header(bytes_headers)
method = extract_method_header(bytes_headers)
if method is not None:
self.request_method = method

return frames

Expand Down
29 changes: 29 additions & 0 deletions tests/test_head_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,35 @@ def test_non_zero_content_and_no_body(self, frame_factory, headers) -> None:
assert event.stream_id == 1
assert event.headers == self.example_response_headers

@pytest.mark.parametrize("headers", [EXAMPLE_REQUEST_HEADERS, EXAMPLE_REQUEST_HEADERS_BYTES])
def test_non_zero_content_and_no_body_after_trailers(self, frame_factory, headers) -> None:
c = h2.connection.H2Connection()
c.initiate_connection()
c.send_headers(1, headers)
c.send_headers(1, [(b"x-checksum", b"abc123")], end_stream=True)

f = frame_factory.build_headers_frame(
[
(b":status", b"200"),
(b"server", b"fake-serv/0.1.0"),
(b"content-length", b"1234"),
],
)
events = c.receive_data(f.serialize())

assert len(events) == 1
event = events[0]

assert isinstance(event, h2.events.ResponseReceived)
assert event.stream_id == 1

data = frame_factory.build_data_frame(b"", flags=["END_STREAM"])
events = c.receive_data(data.serialize())

assert len(events) == 2
assert isinstance(events[0], h2.events.DataReceived)
assert isinstance(events[1], h2.events.StreamEnded)

@pytest.mark.parametrize("headers", [EXAMPLE_REQUEST_HEADERS, EXAMPLE_REQUEST_HEADERS_BYTES])
def test_reject_non_zero_content_and_body(self, frame_factory, headers) -> None:
c = h2.connection.H2Connection()
Expand Down