Merged with the default branch.1.31.1-1

1 files changed, 14 insertions, 2 deletions

diff --git a/src/nodejs/unit-http/http_server.js b/src/nodejs/unit-http/http_server.js
index 89964ec3..0f00b47f 100644
--- a/src/nodejs/unit-http/http_server.js
+++ b/src/nodejs/unit-http/http_server.js
@@ -33,8 +33,17 @@ ServerResponse.prototype.statusMessage = undefined;
 ServerResponse.prototype.headers_len = 0;
 ServerResponse.prototype.headers_count = 0;
 ServerResponse.prototype.headersSent = false;
+ServerResponse.prototype.destroyed = false;
 ServerResponse.prototype.finished = false;
 
+ServerResponse.prototype.destroy = function destroy(error) {
+    if (!this.destroyed) {
+        this.destroyed = true;
+    }
+
+    return this;
+};
+
 ServerResponse.prototype._finish = function _finish() {
     this.headers = {};
     this.headers_len = 0;
@@ -243,8 +252,11 @@ ServerResponse.prototype._writeBody = function(chunk, encoding, callback) {
     }
 
     if (chunk) {
-        if (typeof chunk !== 'string' && !(chunk instanceof Buffer)) {
-            throw new TypeError('First argument must be a string or Buffer');
+        if (typeof chunk !== 'string' && !(chunk instanceof Buffer ||
+                chunk instanceof Uint8Array)) {
+            throw new TypeError(
+                'First argument must be a string, Buffer, ' +
+                'or Uint8Array');
         }
 
         if (typeof chunk === 'string') {