diff options
| author | James M Snell <jasnell@gmail.com> | 2016-02-15 09:40:58 -0800 |
|---|---|---|
| committer | James M Snell <jasnell@gmail.com> | 2016-02-15 12:45:17 -0800 |
| commit | 954a4b4b5bb8a54b2e1d07105e4b2bb05a33e2ff (patch) | |
| tree | f8d285fd3b8f2d278720ec070890fb79f5100e94 /deps | |
| parent | de91e9a8a7cebb4543c13f60d5670beeb12b8ec9 (diff) | |
| download | android-node-v8-954a4b4b5bb8a54b2e1d07105e4b2bb05a33e2ff.tar.gz android-node-v8-954a4b4b5bb8a54b2e1d07105e4b2bb05a33e2ff.tar.bz2 android-node-v8-954a4b4b5bb8a54b2e1d07105e4b2bb05a33e2ff.zip | |
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: https://github.com/nodejs/node/pull/5237
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/http_parser/Makefile | 4 | ||||
| -rw-r--r-- | deps/http_parser/http_parser.c | 2 | ||||
| -rw-r--r-- | deps/http_parser/http_parser.h | 2 | ||||
| -rw-r--r-- | deps/http_parser/test.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/deps/http_parser/Makefile b/deps/http_parser/Makefile index b3e0ff4ae0..970bdc4263 100644 --- a/deps/http_parser/Makefile +++ b/deps/http_parser/Makefile @@ -22,14 +22,14 @@ PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"') HELPER ?= BINEXT ?= ifeq (darwin,$(PLATFORM)) -SONAME ?= libhttp_parser.2.6.1.dylib +SONAME ?= libhttp_parser.2.6.2.dylib SOEXT ?= dylib else ifeq (wine,$(PLATFORM)) CC = winegcc BINEXT = .exe.so HELPER = wine else -SONAME ?= libhttp_parser.so.2.6.1 +SONAME ?= libhttp_parser.so.2.6.2 SOEXT ?= so endif diff --git a/deps/http_parser/http_parser.c b/deps/http_parser/http_parser.c index 33d29bb175..852bed042e 100644 --- a/deps/http_parser/http_parser.c +++ b/deps/http_parser/http_parser.c @@ -440,7 +440,7 @@ enum http_host_state * character or %x80-FF **/ #define IS_HEADER_CHAR(ch) \ - (ch == CR || ch == LF || ch == 9 || (ch > 31 && ch != 127)) + (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127)) #define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res) diff --git a/deps/http_parser/http_parser.h b/deps/http_parser/http_parser.h index e33c0620a1..0cee4cc85b 100644 --- a/deps/http_parser/http_parser.h +++ b/deps/http_parser/http_parser.h @@ -27,7 +27,7 @@ extern "C" { /* Also update SONAME in the Makefile whenever you change these. */ #define HTTP_PARSER_VERSION_MAJOR 2 #define HTTP_PARSER_VERSION_MINOR 6 -#define HTTP_PARSER_VERSION_PATCH 1 +#define HTTP_PARSER_VERSION_PATCH 2 #include <sys/types.h> #if defined(_WIN32) && !defined(__MINGW32__) && \ diff --git a/deps/http_parser/test.c b/deps/http_parser/test.c index 87345bb0dc..26092411c7 100644 --- a/deps/http_parser/test.c +++ b/deps/http_parser/test.c @@ -3356,7 +3356,7 @@ test_double_content_length_error (int req) parsed = http_parser_execute(&parser, &settings_null, buf, buflen); if (parsed != buflen) { - assert(HTTP_PARSER_ERRNO(&parser) == HPE_MULTIPLE_CONTENT_LENGTH); + assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH); return; } |