Skip to content

Commit bfee9da

Browse files
indutnygengjiawen
authored andcommitted
deps: update llhttp to 6.0.0
See: #37678 (comment) PR-URL: #38277 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent 767643f commit bfee9da

File tree

4 files changed

+58
-14
lines changed

4 files changed

+58
-14
lines changed

Diff for: deps/llhttp/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ if (err == HPE_OK) {
9090
parser.reason);
9191
}
9292
```
93+
For more information on API usage, please refer to [src/native/api.h](https://github.com/nodejs/llhttp/blob/master/src/native/api.h).
9394
9495
---
9596

Diff for: deps/llhttp/include/llhttp.h

+56-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef INCLUDE_LLHTTP_H_
22
#define INCLUDE_LLHTTP_H_
33

4-
#define LLHTTP_VERSION_MAJOR 5
5-
#define LLHTTP_VERSION_MINOR 1
4+
#define LLHTTP_VERSION_MAJOR 6
5+
#define LLHTTP_VERSION_MINOR 0
66
#define LLHTTP_VERSION_PATCH 0
77

88
#ifndef LLHTTP_STRICT_MODE
@@ -232,6 +232,12 @@ typedef enum llhttp_method llhttp_method_t;
232232
XX(32, UNLINK, UNLINK) \
233233
XX(33, SOURCE, SOURCE) \
234234
XX(34, PRI, PRI) \
235+
236+
237+
#define RTSP_METHOD_MAP(XX) \
238+
XX(1, GET, GET) \
239+
XX(3, POST, POST) \
240+
XX(6, OPTIONS, OPTIONS) \
235241
XX(35, DESCRIBE, DESCRIBE) \
236242
XX(36, ANNOUNCE, ANNOUNCE) \
237243
XX(37, SETUP, SETUP) \
@@ -245,6 +251,54 @@ typedef enum llhttp_method llhttp_method_t;
245251
XX(45, FLUSH, FLUSH) \
246252

247253

254+
#define HTTP_ALL_METHOD_MAP(XX) \
255+
XX(0, DELETE, DELETE) \
256+
XX(1, GET, GET) \
257+
XX(2, HEAD, HEAD) \
258+
XX(3, POST, POST) \
259+
XX(4, PUT, PUT) \
260+
XX(5, CONNECT, CONNECT) \
261+
XX(6, OPTIONS, OPTIONS) \
262+
XX(7, TRACE, TRACE) \
263+
XX(8, COPY, COPY) \
264+
XX(9, LOCK, LOCK) \
265+
XX(10, MKCOL, MKCOL) \
266+
XX(11, MOVE, MOVE) \
267+
XX(12, PROPFIND, PROPFIND) \
268+
XX(13, PROPPATCH, PROPPATCH) \
269+
XX(14, SEARCH, SEARCH) \
270+
XX(15, UNLOCK, UNLOCK) \
271+
XX(16, BIND, BIND) \
272+
XX(17, REBIND, REBIND) \
273+
XX(18, UNBIND, UNBIND) \
274+
XX(19, ACL, ACL) \
275+
XX(20, REPORT, REPORT) \
276+
XX(21, MKACTIVITY, MKACTIVITY) \
277+
XX(22, CHECKOUT, CHECKOUT) \
278+
XX(23, MERGE, MERGE) \
279+
XX(24, MSEARCH, M-SEARCH) \
280+
XX(25, NOTIFY, NOTIFY) \
281+
XX(26, SUBSCRIBE, SUBSCRIBE) \
282+
XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \
283+
XX(28, PATCH, PATCH) \
284+
XX(29, PURGE, PURGE) \
285+
XX(30, MKCALENDAR, MKCALENDAR) \
286+
XX(31, LINK, LINK) \
287+
XX(32, UNLINK, UNLINK) \
288+
XX(33, SOURCE, SOURCE) \
289+
XX(34, PRI, PRI) \
290+
XX(35, DESCRIBE, DESCRIBE) \
291+
XX(36, ANNOUNCE, ANNOUNCE) \
292+
XX(37, SETUP, SETUP) \
293+
XX(38, PLAY, PLAY) \
294+
XX(39, PAUSE, PAUSE) \
295+
XX(40, TEARDOWN, TEARDOWN) \
296+
XX(41, GET_PARAMETER, GET_PARAMETER) \
297+
XX(42, SET_PARAMETER, SET_PARAMETER) \
298+
XX(43, REDIRECT, REDIRECT) \
299+
XX(44, RECORD, RECORD) \
300+
XX(45, FLUSH, FLUSH) \
301+
248302

249303
#ifdef __cplusplus
250304
} /* extern "C" */

Diff for: deps/llhttp/src/api.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ const char* llhttp_errno_name(llhttp_errno_t err) {
199199
const char* llhttp_method_name(llhttp_method_t method) {
200200
#define HTTP_METHOD_GEN(NUM, NAME, STRING) case HTTP_##NAME: return #STRING;
201201
switch (method) {
202-
HTTP_METHOD_MAP(HTTP_METHOD_GEN)
202+
HTTP_ALL_METHOD_MAP(HTTP_METHOD_GEN)
203203
default: abort();
204204
}
205205
#undef HTTP_METHOD_GEN

Diff for: test/parallel/test-http-methods.js

-11
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,12 @@ const http = require('http');
2929

3030
const methods = [
3131
'ACL',
32-
'ANNOUNCE',
3332
'BIND',
3433
'CHECKOUT',
3534
'CONNECT',
3635
'COPY',
3736
'DELETE',
38-
'DESCRIBE',
39-
'FLUSH',
4037
'GET',
41-
'GET_PARAMETER',
4238
'HEAD',
4339
'LINK',
4440
'LOCK',
@@ -51,24 +47,17 @@ const methods = [
5147
'NOTIFY',
5248
'OPTIONS',
5349
'PATCH',
54-
'PAUSE',
55-
'PLAY',
5650
'POST',
5751
'PRI',
5852
'PROPFIND',
5953
'PROPPATCH',
6054
'PURGE',
6155
'PUT',
6256
'REBIND',
63-
'RECORD',
64-
'REDIRECT',
6557
'REPORT',
6658
'SEARCH',
67-
'SETUP',
68-
'SET_PARAMETER',
6959
'SOURCE',
7060
'SUBSCRIBE',
71-
'TEARDOWN',
7261
'TRACE',
7362
'UNBIND',
7463
'UNLINK',

0 commit comments

Comments
 (0)