Skip to content

Commit

Permalink
Upgrade to llhttp 9.2 (#8146) (#8151)
Browse files Browse the repository at this point in the history
(cherry picked from commit 0ec65c0)
  • Loading branch information
Dreamsorcerer authored Feb 9, 2024
1 parent eb397f3 commit 4682c1c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGES/8146.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgraded *llhttp* to 9.2 -- by :user:`Dreamsorcerer`.
18 changes: 0 additions & 18 deletions tests/test_http_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -623,25 +623,9 @@ def test_headers_content_length_err_2(parser) -> None:
}


@pytest.fixture
def xfail_c_parser_empty_header(request) -> None:
if not all(
(request.getfixturevalue(name) == b"") for name in ("pad1", "pad2", "hdr")
):
return
if isinstance(request.getfixturevalue("parser"), HttpRequestParserPy):
return
request.node.add_marker(
pytest.mark.xfail(
reason="Regression test for Py parser. May match C behaviour later.",
)
)


@pytest.mark.parametrize("hdr", [b"", b"foo"], ids=["name-empty", "with-name"])
@pytest.mark.parametrize("pad2", _pad.keys(), ids=["post-" + n for n in _pad.values()])
@pytest.mark.parametrize("pad1", _pad.keys(), ids=["pre-" + n for n in _pad.values()])
@pytest.mark.usefixtures("xfail_c_parser_empty_header")
def test_invalid_header_spacing(parser, pad1: bytes, pad2: bytes, hdr: bytes) -> None:
text = b"GET /test HTTP/1.1\r\n" b"%s%s%s: value\r\n\r\n" % (pad1, hdr, pad2)
expectation = pytest.raises(http_exceptions.BadHttpMessage)
Expand All @@ -653,8 +637,6 @@ def test_invalid_header_spacing(parser, pad1: bytes, pad2: bytes, hdr: bytes) ->


def test_empty_header_name(parser) -> None:
if not isinstance(parser, HttpRequestParserPy):
pytest.xfail("Regression test for Py parser. May match C behaviour later.")
text = b"GET /test HTTP/1.1\r\n" b":test\r\n\r\n"
with pytest.raises(http_exceptions.BadHttpMessage):
parser.feed_data(text)
Expand Down

0 comments on commit 4682c1c

Please sign in to comment.