nodejs
diff --git a/‎lib/_http_outgoing.js‎
Lines changed: 9 additions & 0 deletions b/‎lib/_http_outgoing.js‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎lib/internal/errors.js‎
Lines changed: 2 additions & 0 deletions b/‎lib/internal/errors.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/parallel/test-http-server-de-chunked-trailer.js‎
Lines changed: 33 additions & 0 deletions b/‎test/parallel/test-http-server-de-chunked-trailer.js‎
Lines changed: 33 additions & 0 deletions
@@ -33,6 +33,7 @@ const checkInvalidHeaderChar = common._checkInvalidHeaderChar;
 const outHeadersKey = require('internal/http').outHeadersKey;
 const async_id_symbol = process.binding('async_wrap').async_id_symbol;
 const nextTick = require('internal/process/next_tick').nextTick;
+const errors = require('internal/errors');
 
 const CRLF = common.CRLF;
 const debug = common.debug;
@@ -427,6 +428,14 @@ function _storeHeader(firstLine, headers) {
     }
   }
 
+  // Test non-chunked message does not have trailer header set,
+  // message will be terminated by the first empty line after the
+  // header fields, regardless of the header fields present in the
+  // message, and thus cannot contain a message body or 'trailers'.
+  if (this.chunkedEncoding !== true && state.trailer) {
+    throw new errors.Error('ERR_HTTP_TRAILER_INVALID');
+  }
+
   this._header = state.header + CRLF;
   this._headerSent = false;
 
 
@@ -155,6 +155,8 @@ E('ERR_PARSE_HISTORY_DATA',
   (oldHistoryPath) => `Could not parse history data in ${oldHistoryPath}`);
 E('ERR_STDERR_CLOSE', 'process.stderr cannot be closed');
 E('ERR_STDOUT_CLOSE', 'process.stdout cannot be closed');
+E('ERR_HTTP_TRAILER_INVALID',
+  'Trailers are invalid with this transfer encoding');
 E('ERR_UNKNOWN_BUILTIN_MODULE', (id) => `No such built-in module: ${id}`);
 E('ERR_UNKNOWN_SIGNAL', (signal) => `Unknown signal: ${signal}`);
 E('ERR_UNKNOWN_STDIN_TYPE', 'Unknown stdin file type');
 
@@ -0,0 +1,33 @@
+'use strict';
+const common = require('../common');
+
+// This test ensures that a Trailer header is set only when a chunked transfer
+// encoding is used.
+
+const assert = require('assert');
+const http = require('http');
+
+const server = http.createServer(common.mustCall(function(req, res) {
+  res.setHeader('Trailer', 'baz');
+  const trailerInvalidErr = {
+    code: 'ERR_HTTP_TRAILER_INVALID',
+    message: 'Trailers are invalid with this transfer encoding',
+    type: Error
+  };
+  assert.throws(() => res.writeHead(200, {'Content-Length': '2'}),
+                common.expectsError(trailerInvalidErr));
+  res.removeHeader('Trailer');
+  res.end('ok');
+}));
+server.listen(0, common.mustCall(() => {
+  http.get({ port: server.address().port }, common.mustCall((res) => {
+    assert.strictEqual(res.statusCode, 200);
+    let buf = '';
+    res.on('data', (chunk) => {
+      buf += chunk;
+    }).on('end', common.mustCall(() => {
+      assert.strictEqual(buf, 'ok');
+    }));
+    server.close();
+  }));
+}));