Fix error handling in server.listen function (#927)

IoT.js-DCO-1.0-Signed-off-by: Robert Sipka [email protected]

Author: robertsipka

src/js/net.js

@@ -503,8 +503,7 @@ Server.prototype.listen = function() {
   var err = self._handle.bind(host, port);
   if (err) {
     self._handle.close();
-    self._handle = null;
-    return err;
+    return self.emit('error', err);
   }
 
   // listen
@@ -516,8 +515,7 @@ Server.prototype.listen = function() {
 
   if (err) {
     self._handle.close();
-    self._handle = null;
-    return err;
+    return self.emit('error', err);
   }
 
   process.nextTick(function() {

test/node/parallel/test-net-bind-twice.js

@@ -0,0 +1,55 @@
+/* Copyright 2017-present Samsung Electronics Co., Ltd. and other contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+'use strict';
+
+var common = require('node/common');
+var assert = require('assert');
+var net = require('net');
+
+var server1 = net.createServer(common.fail);
+server1.listen(0, '127.0.0.1', common.mustCall(function() {
+
+  var server2 = net.createServer(common.fail);
+
+  server2.on('error', common.mustCall(function(e) {
+    assert.strictEqual(e, -98); // EADDRINUSE
+
+    server1.close();
+  }));
+
+  server2.listen(this.address().port, '127.0.0.1', common.fail);
+}));

test/run_pass/test_net_httpclient_error.js

@@ -18,24 +18,47 @@ var http = require('http');
 var recievedResponse = false;
 
 var server = http.createServer(function(request, response) {
-  server.close();
+  var str = '';
+
+  request.on('data', function (chunk) {
+    str += chunk;
+  });
+
+  request.on('end', function() {
+    response.end();
+  });
 });
 
-server.listen(3085, 'localhost');
+server.listen(20004, 5);
 
 // Connection refusal: The request will try to connect to a server,
 // however the connection can not be created because the port is invalid.
-// Therefore the client will destroy the socket without an error emit.
-http.request({
+var req = http.request({
   host: 'localhost',
-  port: 3089,
+  port: 20002,
   path: '/',
   method: 'GET'
 }, function(response) {
+  var str = '';
+
+  response.on('data', function(chunk) {
+    str += chunk;
+  });
+
   response.on('end', function() {
     recievedResponse = true;
+    server.close();
   });
-}).end();
+});
+
+req.on('error', function() {
+  recievedResponse = false;
+  server.close();
+});
+
+req.setTimeout(100, function(){
+  req.end();
+});
 
 process.on('exit', function() {
   assert.equal(recievedResponse, false);

test/testsets.json

@@ -106,6 +106,7 @@
     { "name": "test_process_implicit_exit.js", "expected-failure": true }
   ],
   "node/parallel": [
-    { "name": "test-assert.js" }
+    { "name": "test-assert.js" },
+    { "name": "test-net-bind-twice.js" }
   ]
 }