Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/llhttp/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ export class HTTP {
// Check if we'd like to keep-alive
n('cleanup')
.otherwise(p.invoke(callback.afterMessageComplete, {
1: n('restart'),
1: this.update('content_length', 0, n('restart')),
}, this.update('finish', FINISH.SAFE, lenientClose)));

if (this.mode === 'strict') {
Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/extra.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@ int llhttp__on_headers_complete(llparse_t* s, const char* p, const char* endp) {

#ifdef LLHTTP__TEST_PAUSE_ON_HEADERS_COMPLETE
return LLPARSE__ERROR_PAUSE;
#elif defined(LLHTTP__TEST_SKIP_BODY)
llparse__print(p, endp, "skip body");
return 1;
#else
return 0;
#endif
Expand Down
4 changes: 4 additions & 0 deletions test/md-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ async function buildMode(mode: llhttp.HTTPMode, ty: TestType, meta: any)
extra.push(`-DLLHTTP__TEST_PAUSE_${meta.pause.toUpperCase()}=1`);
}

if (meta.skipBody) {
extra.push('-DLLHTTP__TEST_SKIP_BODY=1');
}

entry = await build(node.llparse, node.entry, `${prefix}-${mode}-${ty}`, {
extra,
}, ty);
Expand Down
45 changes: 45 additions & 0 deletions test/request/content-length.md
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,48 @@ off=14 len=3 span[version]="1.1"
off=17 version complete
off=26 error code=10 reason="Invalid header token"
```

## Content-Length reset when no body is received

<!-- meta={"type": "request", "skipBody": true} -->
```http
PUT /url HTTP/1.1
Content-Length: 123

POST /url HTTP/1.1
Content-Length: 456


```

```log
off=0 message begin
off=0 len=3 span[method]="PUT"
off=3 method complete
off=4 len=4 span[url]="/url"
off=9 url complete
off=14 len=3 span[version]="1.1"
off=17 version complete
off=19 len=14 span[header_field]="Content-Length"
off=34 header_field complete
off=35 len=3 span[header_value]="123"
off=40 header_value complete
off=42 headers complete method=4 v=1/1 flags=20 content_length=123
off=42 skip body
off=42 message complete
off=42 reset
off=42 message begin
off=42 len=4 span[method]="POST"
off=46 method complete
off=47 len=4 span[url]="/url"
off=52 url complete
off=57 len=3 span[version]="1.1"
off=60 version complete
off=62 len=14 span[header_field]="Content-Length"
off=77 header_field complete
off=78 len=3 span[header_value]="456"
off=83 header_value complete
off=85 headers complete method=3 v=1/1 flags=20 content_length=456
off=85 skip body
off=85 message complete
```
41 changes: 41 additions & 0 deletions test/response/content-length.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,44 @@ off=78 chunk header len=0
off=80 chunk complete
off=80 message complete
```

## Content-Length reset when no body is received

<!-- meta={"type": "response", "skipBody": true} -->
```http
HTTP/1.1 200 OK
Content-Length: 123

HTTP/1.1 200 OK
Content-Length: 456


```

```log
off=0 message begin
off=5 len=3 span[version]="1.1"
off=8 version complete
off=13 len=2 span[status]="OK"
off=17 status complete
off=17 len=14 span[header_field]="Content-Length"
off=32 header_field complete
off=33 len=3 span[header_value]="123"
off=38 header_value complete
off=40 headers complete status=200 v=1/1 flags=20 content_length=123
off=40 skip body
off=40 message complete
off=40 reset
off=40 message begin
off=45 len=3 span[version]="1.1"
off=48 version complete
off=53 len=2 span[status]="OK"
off=57 status complete
off=57 len=14 span[header_field]="Content-Length"
off=72 header_field complete
off=73 len=3 span[header_value]="456"
off=78 header_value complete
off=80 headers complete status=200 v=1/1 flags=20 content_length=456
off=80 skip body
off=80 message complete
```