From 5c2566c85a75b656d6645016ac0092e661299e60 Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@google.com>
Date: Fri, 21 Dec 2018 18:43:08 -0500
Subject: [PATCH] 2018-12-26, Version 6.16.0 'Boron' (LTS)

The 6.15.0 security release introduced some unexpected breakages on
the 6.x release line. This is a special release to fix a regression
in the HTTP binary upgrade response body and add a missing CLI flag
to adjust the max header size of the http parser.

Notable changes:

* cli:
  - add --max-http-header-size flag (cjihrig)
    https://github.com/nodejs/node/pull/24811

PR-URL: https://github.com/nodejs/node/pull/25178
---
 CHANGELOG.md                   |  3 ++-
 doc/api/cli.md                 |  2 +-
 doc/changelogs/CHANGELOG_V6.md | 18 ++++++++++++++++++
 src/node_version.h             |  6 +++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adac1878c3111b..0dd160f2de2134 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V6.md#6.15.1">6.15.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V6.md#6.16.0">6.16.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V6.md#6.15.1">6.15.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.15.0">6.15.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.14.4">6.14.4</a><br/>
 <a href="doc/changelogs/CHANGELOG_V6.md#6.14.3">6.14.3</a><br/>
diff --git a/doc/api/cli.md b/doc/api/cli.md
index 0765091106b12c..ecc8b7e60cef55 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -295,7 +295,7 @@ the next argument will be used as a script filename.
 
 ### `--max-http-header-size=size`
 <!-- YAML
-added: REPLACEME
+added: v6.16.0
 -->
 
 Specify the maximum size, in bytes, of HTTP headers. Defaults to 8KB.
diff --git a/doc/changelogs/CHANGELOG_V6.md b/doc/changelogs/CHANGELOG_V6.md
index aeaaff1d072c0d..3d4d70854cd0ce 100644
--- a/doc/changelogs/CHANGELOG_V6.md
+++ b/doc/changelogs/CHANGELOG_V6.md
@@ -7,6 +7,7 @@
 </tr>
 <tr>
 <td valign="top">
+<a href="#6.16.0">6.16.0</a><br/>
 <a href="#6.15.1">6.15.1</a><br/>
 <a href="#6.15.0">6.15.0</a><br/>
 <a href="#6.14.4">6.14.4</a><br/>
@@ -67,6 +68,23 @@
 [Node.js Long Term Support Plan](https://github.com/nodejs/LTS) and
 will be supported actively until April 2018 and maintained until April 2019.
 
+<a id="6.16.0"></a>
+## 2018-12-26, Version 6.16.0 'Boron' (LTS), @MylesBorins
+
+The 6.15.0 security release introduced some unexpected breakages on the 6.x release line.
+This is a special release to fix a regression in the HTTP binary upgrade response body and add
+a missing CLI flag to adjust the max header size of the http parser.
+
+### Notable Changes
+
+* **cli**: add --max-http-header-size flag (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+
+### Commits
+
+* [[`f233b160c9`](https://github.com/nodejs/node/commit/f233b160c9)] - **cli**: add --max-http-header-size flag (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+* [[`59f83d6896`](https://github.com/nodejs/node/commit/59f83d6896)] - **deps**: cherry-pick http\_parser\_set\_max\_header\_size (cjihrig) [#24811](https://github.com/nodejs/node/pull/24811)
+* [[`8a3e0c0697`](https://github.com/nodejs/node/commit/8a3e0c0697)] - **http**: fix regression of binary upgrade response body (Matteo Collina) [#25036](https://github.com/nodejs/node/pull/25036)
+
 <a id="6.15.1"></a>
 ## 2018-12-03, Version 6.15.1 'Boron' (LTS), @rvagg
 
diff --git a/src/node_version.h b/src/node_version.h
index cf983645b46909..3602772fe29f6f 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -2,13 +2,13 @@
 #define SRC_NODE_VERSION_H_
 
 #define NODE_MAJOR_VERSION 6
-#define NODE_MINOR_VERSION 15
-#define NODE_PATCH_VERSION 2
+#define NODE_MINOR_VERSION 16
+#define NODE_PATCH_VERSION 0
 
 #define NODE_VERSION_IS_LTS 1
 #define NODE_VERSION_LTS_CODENAME "Boron"
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)