Skip to content

Commit c11a96a

Browse files
authored
Revert "http-parser -> llhttp (#5364)"
This reverts commit d379c6b.
1 parent 0fc598c commit c11a96a

File tree

11 files changed

+282
-302
lines changed

11 files changed

+282
-302
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -71,41 +71,9 @@ jobs:
7171
run: |
7272
LC_ALL=C sort -c CONTRIBUTORS.txt
7373
74-
gen_llhttp:
75-
name: Generate llhttp sources
76-
needs: lint
77-
runs-on: ubuntu-latest
78-
timeout-minutes: 5
79-
steps:
80-
- name: Checkout
81-
uses: actions/checkout@v2
82-
with:
83-
submodules: true
84-
- name: Cache llhttp generated files
85-
uses: actions/cache@v2
86-
id: cache
87-
with:
88-
key: llhttp-${{ hashFiles('vendor/llhttp/package.json', 'vendor/llhttp/src/**/*') }}
89-
path: vendor/llhttp/build
90-
- name: Setup NodeJS
91-
if: steps.cache.outputs.cache-hit != 'true'
92-
uses: actions/setup-node@v2
93-
with:
94-
node-version: '14'
95-
- name: Generate llhttp sources
96-
if: steps.cache.outputs.cache-hit != 'true'
97-
run: |
98-
make generate-llhttp
99-
- name: Upload llhttp generated files
100-
uses: actions/upload-artifact@v2
101-
with:
102-
name: llhttp
103-
path: vendor/llhttp/build
104-
if-no-files-found: error
105-
10674
test:
10775
name: Test
108-
needs: gen_llhttp
76+
needs: lint
10977
strategy:
11078
matrix:
11179
pyver: [3.7, 3.8, 3.9, '3.10']
@@ -154,12 +122,6 @@ jobs:
154122
if: ${{ matrix.no-extensions == '' }}
155123
run: |
156124
make cythonize
157-
- name: Restore llhttp generated files
158-
if: ${{ matrix.no-extensions == '' }}
159-
uses: actions/download-artifact@v2
160-
with:
161-
name: llhttp
162-
path: vendor/llhttp/build/
163125
- name: Run unittests
164126
env:
165127
COLOR: 'yes'

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
.idea
2525
.install-cython
2626
.install-deps
27-
.llhttp-gen
2827
.installed.cfg
2928
.mypy_cache
3029
.noseids

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[submodule "vendor/llhttp"]
2-
path = vendor/llhttp
3-
url = https://github.com/nodejs/llhttp.git
4-
branch = v3.0.0
1+
[submodule "vendor/http-parser"]
2+
path = vendor/http-parser
3+
url = git://github.com/nodejs/http-parser.git
4+
branch = 54f55a2

CHANGES/3561.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@ aiohttp/_find_header.c: $(call to-hash,aiohttp/hdrs.py ./tools/gen.py)
6262
aiohttp/%.c: aiohttp/%.pyx $(call to-hash,$(CYS)) aiohttp/_find_header.c
6363
cython -3 -o $@ $< -I aiohttp
6464

65-
vendor/llhttp/node_modules: vendor/llhttp/package.json
66-
cd vendor/llhttp; npm install
67-
68-
.llhttp-gen: vendor/llhttp/node_modules
69-
$(MAKE) -C vendor/llhttp generate
70-
@touch .llhttp-gen
71-
72-
.PHONY: generate-llhttp
73-
generate-llhttp: .llhttp-gen
7465

7566
.PHONY: cythonize
7667
cythonize: .install-cython $(PYXS:.pyx=.c)
@@ -90,7 +81,7 @@ fmt format:
9081
mypy:
9182
mypy
9283

93-
.develop: .install-deps generate-llhttp $(call to-hash,$(PYS) $(CYS) $(CS))
84+
.develop: .install-deps $(call to-hash,$(PYS) $(CYS) $(CS))
9485
pip install -e .
9586
@touch .develop
9687

@@ -146,9 +137,6 @@ clean:
146137
@rm -rf aiohttp.egg-info
147138
@rm -f .install-deps
148139
@rm -f .install-cython
149-
@rm -rf vendor/llhttp/node_modules
150-
@rm -f .llhttp-gen
151-
@$(MAKE) -C vendor/llhttp clean
152140

153141
.PHONY: doc
154142
doc:

0 commit comments

Comments
 (0)