From 188cff3c314feee85ac1e38cdb72393c889119e1 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 15 Feb 2016 09:45:33 -0800
Subject: [PATCH] deps: update to http-parser 2.5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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/5238
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Myles Borins <mborins@us.ibm.com>
---
 deps/http_parser/Makefile                 |  2 +-
 deps/http_parser/http_parser.c            |  2 +-
 deps/http_parser/http_parser.h            |  2 +-
 deps/http_parser/test.c                   |  2 +-
 test/parallel/test-http-header-obstext.js | 18 ++++++++++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 test/parallel/test-http-header-obstext.js

diff --git a/deps/http_parser/Makefile b/deps/http_parser/Makefile
index 9ad5fc64ccc0d4..b96b3e266bcf5f 100644
--- a/deps/http_parser/Makefile
+++ b/deps/http_parser/Makefile
@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
-SONAME ?= libhttp_parser.so.2.5.1
+SONAME ?= libhttp_parser.so.2.5.2
 
 CC?=gcc
 AR?=ar
diff --git a/deps/http_parser/http_parser.c b/deps/http_parser/http_parser.c
index e1d4a730c6ea50..228d130cb5e30f 100644
--- a/deps/http_parser/http_parser.c
+++ b/deps/http_parser/http_parser.c
@@ -438,7 +438,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 999b3d58921fce..39b3f23c5a13f5 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 5
-#define HTTP_PARSER_VERSION_PATCH 1
+#define HTTP_PARSER_VERSION_PATCH 2
 
 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
diff --git a/deps/http_parser/test.c b/deps/http_parser/test.c
index 885d89e54814e4..5f754d83c6ac6a 100644
--- a/deps/http_parser/test.c
+++ b/deps/http_parser/test.c
@@ -3251,7 +3251,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;
   }
 
diff --git a/test/parallel/test-http-header-obstext.js b/test/parallel/test-http-header-obstext.js
new file mode 100644
index 00000000000000..ba28768be320e6
--- /dev/null
+++ b/test/parallel/test-http-header-obstext.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const common = require('../common');
+const http = require('http');
+const assert = require('assert');
+
+const server = http.createServer(common.mustCall((req, res) => {
+  res.end('ok');
+}));
+server.listen(common.PORT, () => {
+  http.get({
+    port: common.PORT,
+    headers: {'Test': 'Düsseldorf'}
+  }, common.mustCall((res) => {
+    assert.equal(res.statusCode, 200);
+    server.close();
+  }));
+});