Merge remote-tracking branch 'origin/v0.8'

1 files changed, 18 insertions, 6 deletions

diff --git a/lib/net.js b/lib/net.js
index ca0a53b3e1..4be6402d7f 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -1029,14 +1029,26 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) {
 function listen(self, address, port, addressType, backlog, fd) {
   if (!cluster) cluster = require('cluster');
 
-  if (cluster.isWorker) {
-    cluster._getServer(self, address, port, addressType, fd, function(handle) {
-      self._handle = handle;
-      self._listen2(address, port, addressType, backlog, fd);
-    });
-  } else {
+  if (cluster.isMaster) {
     self._listen2(address, port, addressType, backlog, fd);
+    return;
   }
+
+  cluster._getServer(self, address, port, addressType, fd, function(handle) {
+    // Some operating systems (notably OS X and Solaris) don't report EADDRINUSE
+    // errors right away. libuv mimics that behavior for the sake of platform
+    // consistency but that means we have have a socket on our hands that is
+    // not actually bound. That's why we check if the actual port matches what
+    // we requested and if not, raise an error. The exception is when port == 0
+    // because that means "any random port".
+    if (port && handle.getsockname && port != handle.getsockname().port) {
+      self.emit('error', errnoException('EADDRINUSE', 'bind'));
+      return;
+    }
+
+    self._handle = handle;
+    self._listen2(address, port, addressType, backlog, fd);
+  });
 }