Commit 954a4b4
committed
deps: update to http-parser 2.6.2
Fixes http-parser regression with IS_HEADER_CHAR check
Add test case for obstext characters (> 0x80) is header
PR-URL: #5237
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>1 parent de91e9a commit 954a4b4
5 files changed
Lines changed: 23 additions & 5 deletions
File tree
- deps/http_parser
- test/parallel
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,14 +22,14 @@ PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') | |||
| 22 | 22 | HELPER ?= | |
| 23 | 23 | BINEXT ?= | |
| 24 | 24 | ifeq (darwin,$(PLATFORM)) | |
| 25 | - SONAME ?= libhttp_parser.2.6.1.dylib | ||
| 25 | + SONAME ?= libhttp_parser.2.6.2.dylib | ||
| 26 | 26 | SOEXT ?= dylib | |
| 27 | 27 | else ifeq (wine,$(PLATFORM)) | |
| 28 | 28 | CC = winegcc | |
| 29 | 29 | BINEXT = .exe.so | |
| 30 | 30 | HELPER = wine | |
| 31 | 31 | else | |
| 32 | - SONAME ?= libhttp_parser.so.2.6.1 | ||
| 32 | + SONAME ?= libhttp_parser.so.2.6.2 | ||
| 33 | 33 | SOEXT ?= so | |
| 34 | 34 | endif | |
| 35 | 35 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -440,7 +440,7 @@ enum http_host_state | |||
| 440 | 440 | * character or %x80-FF | |
| 441 | 441 | **/ | |
| 442 | 442 | #define IS_HEADER_CHAR(ch) \ | |
| 443 | - (ch == CR || ch == LF || ch == 9 || (ch > 31 && ch != 127)) | ||
| 443 | + (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127)) | ||
| 444 | 444 | ||
| 445 | 445 | #define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res) | |
| 446 | 446 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ extern "C" { | |||
| 27 | 27 | /* Also update SONAME in the Makefile whenever you change these. */ | |
| 28 | 28 | #define HTTP_PARSER_VERSION_MAJOR 2 | |
| 29 | 29 | #define HTTP_PARSER_VERSION_MINOR 6 | |
| 30 | - #define HTTP_PARSER_VERSION_PATCH 1 | ||
| 30 | + #define HTTP_PARSER_VERSION_PATCH 2 | ||
| 31 | 31 | ||
| 32 | 32 | #include <sys/types.h> | |
| 33 | 33 | #if defined(_WIN32) && !defined(__MINGW32__) && \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3356,7 +3356,7 @@ test_double_content_length_error (int req) | |||
| 3356 | 3356 | ||
| 3357 | 3357 | parsed = http_parser_execute(&parser, &settings_null, buf, buflen); | |
| 3358 | 3358 | if (parsed != buflen) { | |
| 3359 | - assert(HTTP_PARSER_ERRNO(&parser) == HPE_MULTIPLE_CONTENT_LENGTH); | ||
| 3359 | + assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH); | ||
| 3360 | 3360 | return; | |
| 3361 | 3361 | } | |
| 3362 | 3362 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,18 @@ | |||
| 1 | + 'use strict'; | ||
| 2 | + | ||
| 3 | + const common = require('../common'); | ||
| 4 | + const http = require('http'); | ||
| 5 | + const assert = require('assert'); | ||
| 6 | + | ||
| 7 | + const server = http.createServer(common.mustCall((req, res) => { | ||
| 8 | + res.end('ok'); | ||
| 9 | + })); | ||
| 10 | + server.listen(common.PORT, () => { | ||
| 11 | + http.get({ | ||
| 12 | + port: common.PORT, | ||
| 13 | + headers: {'Test': 'Düsseldorf'} | ||
| 14 | + }, common.mustCall((res) => { | ||
| 15 | + assert.equal(res.statusCode, 200); | ||
| 16 | + server.close(); | ||
| 17 | + })); | ||
| 18 | + }); | ||
0 commit comments