lib: return this from net.Socket.end()

PR-URL: #13481 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Evan Lucas <[email protected]> Reviewed-By: Brian White <[email protected]>
nodejs · Jun 7, 2017 · 4b2c756 · 4b2c756
1 parent 71a3d2c
commit 4b2c756
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/doc/api/net.md b/doc/api/net.md
@@ -648,6 +648,8 @@ server will still send some data.
 If `data` is specified, it is equivalent to calling
 `socket.write(data, encoding)` followed by [`socket.end()`][].
 
+Returns `socket`.
+
 ### socket.localAddress
 <!-- YAML
 added: v0.9.6

diff --git a/lib/net.js b/lib/net.js
@@ -497,6 +497,8 @@ Socket.prototype.end = function(data, encoding) {
     this.read(0);
   else
     maybeDestroy(this);
+
+  return this;
 };
 
 

diff --git a/test/parallel/test-socket-write-after-fin.js b/test/parallel/test-socket-write-after-fin.js
@@ -2,7 +2,7 @@
 const common = require('../common');
 const assert = require('assert');
 const net = require('net');
-const expected = 'hello1hello2hello3\nTHUNDERMUSCLE!';
+const expected = 'hello1hello2hello3\nbye';
 
 const server = net.createServer({
   allowHalfOpen: true
@@ -35,5 +35,6 @@ server.listen(0, common.mustCall(function() {
   sock.write('hello1');
   sock.write('hello2');
   sock.write('hello3\n');
-  sock.end('THUNDERMUSCLE!');
+  assert.strictEqual(sock.end('bye'), sock);
+
 }));
-Original file line number
+Diff line change
@@ Expand Up / @@ -497,6 +497,8 @@ Socket.prototype.end = function(data, encoding) { @@
         this.read(0);
       else
         maybeDestroy(this);
+      return this;
     };
@@ Expand Down @@