From 9707b7c783ffacbf066ed4183b3e80ae35c6588b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 11 Oct 2018 16:08:25 +0200
Subject: [PATCH 01/14] Add support for Node 10.12.x. - following
 https://github.com/nodejs/node/blob/master/src/node_http_parser.cc, the core
 HTTP parser now validates the arguments given to the constructor. This used
 to by a string but is now a number (0,1, 2)

---
 http-parser.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/http-parser.js b/http-parser.js
index 8d30fa3..2e6922a 100644
--- a/http-parser.js
+++ b/http-parser.js
@@ -2,11 +2,14 @@
 
 var assert = require('assert');
 
+var nodeVersion = process.version;
+var isNode10 = nodeVersion.startsWith("v10.");
+
 exports.HTTPParser = HTTPParser;
 function HTTPParser(type) {
   assert.ok(type === HTTPParser.REQUEST || type === HTTPParser.RESPONSE);
   this.type = type;
-  this.state = type + '_LINE';
+  this.state = (isNode10 ? type === HTTPParser.REQUEST ? "REQUEST" : "RESPONSE" : type) + '_LINE';
   this.info = {
     headers: [],
     upgrade: false
@@ -20,10 +23,11 @@ function HTTPParser(type) {
   this.isUserCall = false;
   this.hadError = false;
 }
+
 HTTPParser.encoding = 'ascii';
 HTTPParser.maxHeaderSize = 80 * 1024; // maxHeaderSize (in bytes) is configurable, but 80kb by default;
-HTTPParser.REQUEST = 'REQUEST';
-HTTPParser.RESPONSE = 'RESPONSE';
+HTTPParser.REQUEST = isNode10 ? 0 : 'REQUEST';
+HTTPParser.RESPONSE = isNode10 ? 1 : 'RESPONSE';
 var kOnHeaders = HTTPParser.kOnHeaders = 0;
 var kOnHeadersComplete = HTTPParser.kOnHeadersComplete = 1;
 var kOnBody = HTTPParser.kOnBody = 2;

From 084e6ad3fa410ae75fc3c31d3fcd0f8a8fd84072 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Thu, 11 Oct 2018 16:12:49 +0200
Subject: [PATCH 02/14] Update package.json

Update version number, as the Node.js compatibility has been updated.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa0faa0..a848c24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-parser-js",
-  "version": "0.4.13",
+  "version": "0.5.0",
   "description": "A pure JS HTTP parser for node.",
   "main": "http-parser.js",
   "scripts": {

From ba6d6fd99c6d846405ffc2e3bf9253e910fea704 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Thu, 11 Oct 2018 16:13:34 +0200
Subject: [PATCH 03/14] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5a140..40be775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # HTTP Parser
 
+## 0.5.0
+
+Add Node.js 10.x support.
+
 ## 0.4.4
 
 Made 'maxHeaderSize' configurable.
@@ -11,4 +15,4 @@ require('http-parser-js').HTTPParser.maxHeaderSize = 1024 * 1024; // 1MB instead
 
 var http = require('http');
 // ...
-```
\ No newline at end of file
+```

From f1f7730e81624f5360a9d564986edf9ffbfebc84 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Thu, 11 Oct 2018 16:19:25 +0200
Subject: [PATCH 04/14] Update .travis.yml

Add nodejs 8 and 10 to Travis.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9b206e7..2ae9d62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: node_js
 node_js:
+  - '10'
+  - '8'
   - '6'

From 652abf523cd7bd2008fb8b83eb0983ce99998cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 11 Oct 2018 17:10:11 +0200
Subject: [PATCH 05/14] Fixed several unit tests. - Two failures remain that
 might be due to incompatible nodejs changes

---
 tests/parallel/test-http-invalid-urls.js         | 2 +-
 tests/parallel/test-http-parser-bad-ref.js       | 2 +-
 tests/parallel/test-http-request-end-twice.js    | 2 +-
 tests/parallel/test-http-server-multiheaders2.js | 2 +-
 tests/parallel/test-http-unix-socket.js          | 2 +-
 tests/parallel/test-http-write-head.js           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/parallel/test-http-invalid-urls.js b/tests/parallel/test-http-invalid-urls.js
index 678e8ec..e305130 100644
--- a/tests/parallel/test-http-invalid-urls.js
+++ b/tests/parallel/test-http-invalid-urls.js
@@ -11,7 +11,7 @@ function test(host) {
     [http, https].forEach((module) => {
       assert.throws(() => module[method](host, () => {
         throw new Error(`${module}.${method} should not connect to ${host}`);
-      }), error);
+      }), error + " " + host);
     });
   });
 }
diff --git a/tests/parallel/test-http-parser-bad-ref.js b/tests/parallel/test-http-parser-bad-ref.js
index 73d5f7e..29b5d9c 100644
--- a/tests/parallel/test-http-parser-bad-ref.js
+++ b/tests/parallel/test-http-parser-bad-ref.js
@@ -24,7 +24,7 @@ function flushPool() {
 function demoBug(part1, part2) {
   flushPool();
 
-  var parser = new HTTPParser('REQUEST');
+  var parser = new HTTPParser(0);
 
   parser.headers = [];
   parser.url = '';
diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index fe08ae2..af90fcd 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(!req.end());
+      assert.ok(req.end());
       server.close();
     });
     res.resume();
diff --git a/tests/parallel/test-http-server-multiheaders2.js b/tests/parallel/test-http-server-multiheaders2.js
index b019df8..6febd20 100644
--- a/tests/parallel/test-http-server-multiheaders2.js
+++ b/tests/parallel/test-http-server-multiheaders2.js
@@ -54,7 +54,7 @@ var srv = http.createServer(function(req, res) {
                  'foo', 'header parsed incorrectly: ' + header);
   });
   multipleAllowed.forEach(function(header) {
-    const sep = (process.version < 'v8.0') ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+    const sep = (parseInt(process.versions.node[0] + "" + process.versions.node[1]) < 8) ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
     assert.strictEqual(req.headers[header.toLowerCase()], `foo${sep}bar`,
                        `header parsed incorrectly: ${header}`);
   });
diff --git a/tests/parallel/test-http-unix-socket.js b/tests/parallel/test-http-unix-socket.js
index bdac056..f6c88ff 100644
--- a/tests/parallel/test-http-unix-socket.js
+++ b/tests/parallel/test-http-unix-socket.js
@@ -46,7 +46,7 @@ server.listen(common.PIPE, function() {
       server.close(function(error) {
         assert.equal(error, undefined);
         server.close(function(error) {
-          assert.equal(error && error.message, 'Not running');
+          assert.equal(error && error.message, 'Server is not running.');
         });
       });
     });
diff --git a/tests/parallel/test-http-write-head.js b/tests/parallel/test-http-write-head.js
index b7c7b6c..db0dd37 100644
--- a/tests/parallel/test-http-write-head.js
+++ b/tests/parallel/test-http-write-head.js
@@ -25,7 +25,7 @@ var s = http.createServer(function(req, res) {
     res.setHeader('foo', undefined);
   } catch (e) {
     assert.ok(e instanceof Error);
-    assert.ok(e.message.indexOf('"value"') != -1);
+    assert.ok(e.message.indexOf('value') != -1);
     threw = true;
   }
   assert.ok(threw, 'Undefined value should throw');

From 501bc22d5d27e8fad108793fabd7cdc197b68a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 11 Oct 2018 17:27:46 +0200
Subject: [PATCH 06/14] Fix unit tests for v6 and v8

---
 tests/parallel/test-http-request-end-twice.js | 2 +-
 tests/parallel/test-http-unix-socket.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index af90fcd..0030faf 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(req.end());
+      assert.ok(process.version.startsWith("v10.") ? req.end() : !req.end());
       server.close();
     });
     res.resume();
diff --git a/tests/parallel/test-http-unix-socket.js b/tests/parallel/test-http-unix-socket.js
index f6c88ff..8f81117 100644
--- a/tests/parallel/test-http-unix-socket.js
+++ b/tests/parallel/test-http-unix-socket.js
@@ -46,7 +46,7 @@ server.listen(common.PIPE, function() {
       server.close(function(error) {
         assert.equal(error, undefined);
         server.close(function(error) {
-          assert.equal(error && error.message, 'Server is not running.');
+          assert.equal(error && error.message, process.version.startsWith("v10.") ? "Server is not running." : 'Not running');
         });
       });
     });

From d1c0c4c1a854ba0001374bbf213941b2454a64f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 11 Oct 2018 17:30:55 +0200
Subject: [PATCH 07/14] Fix another one

---
 tests/parallel/test-http-parser-bad-ref.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel/test-http-parser-bad-ref.js b/tests/parallel/test-http-parser-bad-ref.js
index 29b5d9c..1a47b92 100644
--- a/tests/parallel/test-http-parser-bad-ref.js
+++ b/tests/parallel/test-http-parser-bad-ref.js
@@ -24,7 +24,7 @@ function flushPool() {
 function demoBug(part1, part2) {
   flushPool();
 
-  var parser = new HTTPParser(0);
+  var parser = new HTTPParser(process.version.startsWith("v10.") ? 0 : 'REQUEST');
 
   parser.headers = [];
   parser.url = '';

From 0489d309e477f0c37fefebc0916d3dcd5566e563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:06:19 +0100
Subject: [PATCH 08/14] Revert "Add support for Node 10.12.x."

This reverts commit 9707b7c783ffacbf066ed4183b3e80ae35c6588b.
---
 http-parser.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/http-parser.js b/http-parser.js
index 2e6922a..8d30fa3 100644
--- a/http-parser.js
+++ b/http-parser.js
@@ -2,14 +2,11 @@
 
 var assert = require('assert');
 
-var nodeVersion = process.version;
-var isNode10 = nodeVersion.startsWith("v10.");
-
 exports.HTTPParser = HTTPParser;
 function HTTPParser(type) {
   assert.ok(type === HTTPParser.REQUEST || type === HTTPParser.RESPONSE);
   this.type = type;
-  this.state = (isNode10 ? type === HTTPParser.REQUEST ? "REQUEST" : "RESPONSE" : type) + '_LINE';
+  this.state = type + '_LINE';
   this.info = {
     headers: [],
     upgrade: false
@@ -23,11 +20,10 @@ function HTTPParser(type) {
   this.isUserCall = false;
   this.hadError = false;
 }
-
 HTTPParser.encoding = 'ascii';
 HTTPParser.maxHeaderSize = 80 * 1024; // maxHeaderSize (in bytes) is configurable, but 80kb by default;
-HTTPParser.REQUEST = isNode10 ? 0 : 'REQUEST';
-HTTPParser.RESPONSE = isNode10 ? 1 : 'RESPONSE';
+HTTPParser.REQUEST = 'REQUEST';
+HTTPParser.RESPONSE = 'RESPONSE';
 var kOnHeaders = HTTPParser.kOnHeaders = 0;
 var kOnHeadersComplete = HTTPParser.kOnHeadersComplete = 1;
 var kOnBody = HTTPParser.kOnBody = 2;

From c5f57f35aaebbce380d736d7b6f6030e2f308dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:07:40 +0100
Subject: [PATCH 09/14] Updated readme

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40be775..c304c99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 0.5.0
 
-Add Node.js 10.x support.
+Add TravisCI Nodejs 10.
 
 ## 0.4.4
 

From 742324406ca7d7c6411dd94805bf34ecc994dd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:10:37 +0100
Subject: [PATCH 10/14] Revert "Fix another one"

This reverts commit a3a1cfddb7a181203b24c5129ad04f4781726948.
---
 tests/parallel/test-http-parser-bad-ref.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel/test-http-parser-bad-ref.js b/tests/parallel/test-http-parser-bad-ref.js
index 1a47b92..29b5d9c 100644
--- a/tests/parallel/test-http-parser-bad-ref.js
+++ b/tests/parallel/test-http-parser-bad-ref.js
@@ -24,7 +24,7 @@ function flushPool() {
 function demoBug(part1, part2) {
   flushPool();
 
-  var parser = new HTTPParser(process.version.startsWith("v10.") ? 0 : 'REQUEST');
+  var parser = new HTTPParser(0);
 
   parser.headers = [];
   parser.url = '';

From 0d8c054e14c92f93187c4cc1e924d6a60f23399f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:13:28 +0100
Subject: [PATCH 11/14] Revert "Fixed several unit tests."

This reverts commit d15a5c961dd50754efe6d8d1343dd898320d5190.

# Conflicts:
#	tests/parallel/test-http-request-end-twice.js
#	tests/parallel/test-http-unix-socket.js
---
 tests/parallel/test-http-invalid-urls.js         | 2 +-
 tests/parallel/test-http-parser-bad-ref.js       | 2 +-
 tests/parallel/test-http-request-end-twice.js    | 2 +-
 tests/parallel/test-http-server-multiheaders2.js | 2 +-
 tests/parallel/test-http-unix-socket.js          | 2 +-
 tests/parallel/test-http-write-head.js           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/parallel/test-http-invalid-urls.js b/tests/parallel/test-http-invalid-urls.js
index e305130..678e8ec 100644
--- a/tests/parallel/test-http-invalid-urls.js
+++ b/tests/parallel/test-http-invalid-urls.js
@@ -11,7 +11,7 @@ function test(host) {
     [http, https].forEach((module) => {
       assert.throws(() => module[method](host, () => {
         throw new Error(`${module}.${method} should not connect to ${host}`);
-      }), error + " " + host);
+      }), error);
     });
   });
 }
diff --git a/tests/parallel/test-http-parser-bad-ref.js b/tests/parallel/test-http-parser-bad-ref.js
index 29b5d9c..73d5f7e 100644
--- a/tests/parallel/test-http-parser-bad-ref.js
+++ b/tests/parallel/test-http-parser-bad-ref.js
@@ -24,7 +24,7 @@ function flushPool() {
 function demoBug(part1, part2) {
   flushPool();
 
-  var parser = new HTTPParser(0);
+  var parser = new HTTPParser('REQUEST');
 
   parser.headers = [];
   parser.url = '';
diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index 0030faf..af90fcd 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(process.version.startsWith("v10.") ? req.end() : !req.end());
+      assert.ok(req.end());
       server.close();
     });
     res.resume();
diff --git a/tests/parallel/test-http-server-multiheaders2.js b/tests/parallel/test-http-server-multiheaders2.js
index 6febd20..b019df8 100644
--- a/tests/parallel/test-http-server-multiheaders2.js
+++ b/tests/parallel/test-http-server-multiheaders2.js
@@ -54,7 +54,7 @@ var srv = http.createServer(function(req, res) {
                  'foo', 'header parsed incorrectly: ' + header);
   });
   multipleAllowed.forEach(function(header) {
-    const sep = (parseInt(process.versions.node[0] + "" + process.versions.node[1]) < 8) ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+    const sep = (process.version < 'v8.0') ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
     assert.strictEqual(req.headers[header.toLowerCase()], `foo${sep}bar`,
                        `header parsed incorrectly: ${header}`);
   });
diff --git a/tests/parallel/test-http-unix-socket.js b/tests/parallel/test-http-unix-socket.js
index 8f81117..bdac056 100644
--- a/tests/parallel/test-http-unix-socket.js
+++ b/tests/parallel/test-http-unix-socket.js
@@ -46,7 +46,7 @@ server.listen(common.PIPE, function() {
       server.close(function(error) {
         assert.equal(error, undefined);
         server.close(function(error) {
-          assert.equal(error && error.message, process.version.startsWith("v10.") ? "Server is not running." : 'Not running');
+          assert.equal(error && error.message, 'Not running');
         });
       });
     });
diff --git a/tests/parallel/test-http-write-head.js b/tests/parallel/test-http-write-head.js
index db0dd37..b7c7b6c 100644
--- a/tests/parallel/test-http-write-head.js
+++ b/tests/parallel/test-http-write-head.js
@@ -25,7 +25,7 @@ var s = http.createServer(function(req, res) {
     res.setHeader('foo', undefined);
   } catch (e) {
     assert.ok(e instanceof Error);
-    assert.ok(e.message.indexOf('value') != -1);
+    assert.ok(e.message.indexOf('"value"') != -1);
     threw = true;
   }
   assert.ok(threw, 'Undefined value should throw');

From fb9583c8a8ff6a7d7b395be0e28f1afedf058fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:17:16 +0100
Subject: [PATCH 12/14] Revert unit test

---
 tests/parallel/test-http-request-end-twice.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index af90fcd..fe08ae2 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(req.end());
+      assert.ok(!req.end());
       server.close();
     });
     res.resume();

From 78b12ce52f25365d5edfca1b973c11a3916ebfed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:26:39 +0100
Subject: [PATCH 13/14] * Improved/fixed unit tests for Node.js 10.15.1 *
 Updated pom and CHANGELOG.md

---
 CHANGELOG.md                                     | 5 +++--
 package.json                                     | 2 +-
 tests/parallel/test-http-invalid-urls.js         | 2 +-
 tests/parallel/test-http-request-end-twice.js    | 2 +-
 tests/parallel/test-http-server-multiheaders2.js | 3 ++-
 tests/parallel/test-http-unix-socket.js          | 2 +-
 tests/parallel/test-http-write-head.js           | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c304c99..aa63b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # HTTP Parser
 
-## 0.5.0
+## 0.5.1
 
-Add TravisCI Nodejs 10.
+Add TravisCI Nodejs 10 and 8.
+Improved/fixed unit tests for running on Node.js 10.
 
 ## 0.4.4
 
diff --git a/package.json b/package.json
index a848c24..58e0f27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-parser-js",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A pure JS HTTP parser for node.",
   "main": "http-parser.js",
   "scripts": {
diff --git a/tests/parallel/test-http-invalid-urls.js b/tests/parallel/test-http-invalid-urls.js
index 678e8ec..e305130 100644
--- a/tests/parallel/test-http-invalid-urls.js
+++ b/tests/parallel/test-http-invalid-urls.js
@@ -11,7 +11,7 @@ function test(host) {
     [http, https].forEach((module) => {
       assert.throws(() => module[method](host, () => {
         throw new Error(`${module}.${method} should not connect to ${host}`);
-      }), error);
+      }), error + " " + host);
     });
   });
 }
diff --git a/tests/parallel/test-http-request-end-twice.js b/tests/parallel/test-http-request-end-twice.js
index fe08ae2..0030faf 100644
--- a/tests/parallel/test-http-request-end-twice.js
+++ b/tests/parallel/test-http-request-end-twice.js
@@ -10,7 +10,7 @@ var server = http.Server(function(req, res) {
 server.listen(0, function() {
   var req = http.get({port: this.address().port}, function(res) {
     res.on('end', function() {
-      assert.ok(!req.end());
+      assert.ok(process.version.startsWith("v10.") ? req.end() : !req.end());
       server.close();
     });
     res.resume();
diff --git a/tests/parallel/test-http-server-multiheaders2.js b/tests/parallel/test-http-server-multiheaders2.js
index b019df8..1539da0 100644
--- a/tests/parallel/test-http-server-multiheaders2.js
+++ b/tests/parallel/test-http-server-multiheaders2.js
@@ -54,7 +54,8 @@ var srv = http.createServer(function(req, res) {
                  'foo', 'header parsed incorrectly: ' + header);
   });
   multipleAllowed.forEach(function(header) {
-    const sep = (process.version < 'v8.0') ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+    const sep = (parseInt(process.versions.node[0] + "" + process.versions.node[1]) < 8) ? ', ' : (header.toLowerCase() === 'cookie' ? '; ' : ', ');
+
     assert.strictEqual(req.headers[header.toLowerCase()], `foo${sep}bar`,
                        `header parsed incorrectly: ${header}`);
   });
diff --git a/tests/parallel/test-http-unix-socket.js b/tests/parallel/test-http-unix-socket.js
index bdac056..8f81117 100644
--- a/tests/parallel/test-http-unix-socket.js
+++ b/tests/parallel/test-http-unix-socket.js
@@ -46,7 +46,7 @@ server.listen(common.PIPE, function() {
       server.close(function(error) {
         assert.equal(error, undefined);
         server.close(function(error) {
-          assert.equal(error && error.message, 'Not running');
+          assert.equal(error && error.message, process.version.startsWith("v10.") ? "Server is not running." : 'Not running');
         });
       });
     });
diff --git a/tests/parallel/test-http-write-head.js b/tests/parallel/test-http-write-head.js
index b7c7b6c..db0dd37 100644
--- a/tests/parallel/test-http-write-head.js
+++ b/tests/parallel/test-http-write-head.js
@@ -25,7 +25,7 @@ var s = http.createServer(function(req, res) {
     res.setHeader('foo', undefined);
   } catch (e) {
     assert.ok(e instanceof Error);
-    assert.ok(e.message.indexOf('"value"') != -1);
+    assert.ok(e.message.indexOf('value') != -1);
     threw = true;
   }
   assert.ok(threw, 'Undefined value should throw');

From 9ee80143d1a89dfdf68bbb8bbcf6d82a27ed0ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 30 Jan 2019 10:28:20 +0100
Subject: [PATCH 14/14] Resolve merge conflict

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58e0f27..a848c24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "http-parser-js",
-  "version": "0.5.1",
+  "version": "0.5.0",
   "description": "A pure JS HTTP parser for node.",
   "main": "http-parser.js",
   "scripts": {