From c668185adde3a474585a11f172b8387e270ec23b Mon Sep 17 00:00:00 2001
From: Aaditya Bhatia <aadityabhatia@gmail.com>
Date: Mon, 8 Oct 2012 18:01:03 -0700
Subject: [PATCH] cluster: make 'listening' handler see actual port

Make the 'listening' event handler in the master process see the actual port
that the worker bound to when the worker specified port 0, i.e. a random port.
---
 lib/cluster.js                             |  2 +-
 test/simple/test-cluster-listening-port.js | 44 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/simple/test-cluster-listening-port.js

diff --git a/lib/cluster.js b/lib/cluster.js
index 8f7df3e1261..4bece2d74c1 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -535,7 +535,7 @@ cluster._getServer = function(tcpSelf, address, port, addressType, fd, cb) {
     sendInternalMessage(cluster.worker, {
       cmd: 'listening',
       address: address,
-      port: port,
+      port: tcpSelf.address().port || port,
       addressType: addressType,
       fd: fd
     });
diff --git a/test/simple/test-cluster-listening-port.js b/test/simple/test-cluster-listening-port.js
new file mode 100644
index 00000000000..605ffd053f7
--- /dev/null
+++ b/test/simple/test-cluster-listening-port.js
@@ -0,0 +1,44 @@
+// 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.
+
+var assert = require('assert');
+var cluster = require('cluster');
+var net = require('net');
+
+if (cluster.isMaster) {
+  var port = null;
+  cluster.fork();
+  cluster.on('listening', function(worker, address) {
+    port = address.port;
+    // ensure that the port is not 0 or null
+    assert(port);
+    // ensure that the port is numerical
+    assert.strictEqual(typeof(port), 'number');
+    worker.destroy();
+  });
+  process.on('exit', function() {
+    // ensure that the 'listening' handler has been called
+    assert(port);
+  });
+}
+else {
+  net.createServer(assert.fail).listen(0);
+}