diff --git a/lib/net.js b/lib/net.js index c91fd3fb2c..7fca4da155 100644 --- a/lib/net.js +++ b/lib/net.js @@ -936,17 +936,6 @@ Stream.prototype.resume = function () { }; -var forceCloseWarning; - -Stream.prototype.forceClose = function (e) { - if (!forceCloseWarning) { - forceCloseWarning = "forceClose() has been renamed to destroy()"; - sys.error(forceCloseWarning); - } - return this.destroy(e); -}; - - Stream.prototype.destroy = function (exception) { // pool is shared between sockets, so don't need to free it here. var self = this; @@ -1011,15 +1000,6 @@ Stream.prototype._shutdown = function () { } }; -var closeDepricationWarning; - -Stream.prototype.close = function (data, encoding) { - if (!closeDepricationWarning) { - closeDepricationWarning = "Notification: Stream.prototype.close has been renamed to end()"; - sys.error(closeDepricationWarning); - } - return this.end(data, encoding); -}; Stream.prototype.end = function (data, encoding) { if (this.writable) { diff --git a/test/simple/test-http-eof-on-connect.js b/test/simple/test-http-eof-on-connect.js index 34d8af0f19..367538d5ce 100644 --- a/test/simple/test-http-eof-on-connect.js +++ b/test/simple/test-http-eof-on-connect.js @@ -12,8 +12,8 @@ server.listen(common.PORT); server.addListener("listening", function() { net.createConnection(common.PORT).addListener("connect", function () { - this.close(); + this.destroy(); }).addListener("close", function () { server.close(); }); -}); \ No newline at end of file +});