Skip to content
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.

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

Fix bump llhttp to v8.1.1 #7367

Merged
merged 15 commits into from
Jul 18, 2023
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "vendor/llhttp"]
path = vendor/llhttp
url = https://github.com/nodejs/llhttp.git
branch = v8.1.1
branch = v8.x
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ Install pre-commit hooks:

Congratulations, you are ready to run the test suite!

.. include:: ../vendor/README.rst


Run autoformatter
-----------------
Expand Down
3 changes: 0 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ Please feel free to file an issue on the `bug tracker
<https://github.com/aio-libs/aiohttp/issues>`_ if you have found a bug
or have some suggestion in order to improve the library.

The library uses `Azure Pipelines <https://dev.azure.com/aio-libs/aiohttp/_build>`_ for
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
Continuous Integration.


Dependencies
============
Expand Down
1 change: 1 addition & 0 deletions tests/test_http_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ def test_http_response_parser_bad(response: Any) -> None:
response.feed_data(b"HTT/1\r\n\r\n")


@pytest.mark.skipif(not NO_EXTENSIONS, reason="Behaviour has changed in C parser")
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
def test_http_response_parser_code_under_100(response: Any) -> None:
msg = response.feed_data(b"HTTP/1.1 99 test\r\n\r\n")[0][0][0]
assert msg.code == 99
Expand Down
23 changes: 23 additions & 0 deletions vendor/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
LLHTTP
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved
------

When building aiohttp from source, there is a pure Python parser used by default.
For better performance, you may want to build the higher performance C parser.

To build this ``llhttp`` parser, first get/update the submodules (to update to a
newer release, add ``--remote`` and check the branch in ``.gitmodules``)::

git submodule update --init --recursive

Then build ``llhttp``::

cd vendor/llhttp/
npm install
make

Then build our parser::

cd -
make cythonize

Then you can build or install it with ``python -m build`` or ``pip install -e .``
2 changes: 1 addition & 1 deletion vendor/llhttp