Permalink
Browse files

net: fix .listen({fd:0})

  • Loading branch information...
1 parent 6db9e12 commit 34c750d7a96ad29c023d117f55239b94e90d23d5 @bnoordhuis bnoordhuis committed Aug 2, 2012
Showing with 37 additions and 1 deletion.
  1. +1 −1 lib/net.js
  2. +36 −0 test/simple/test-net-listen-fd0.js
View
@@ -980,7 +980,7 @@ Server.prototype.listen = function() {
if (h instanceof TCP) {
self._handle = h;
listen(self, null, -1, -1, backlog);
- } else if (h.fd && typeof h.fd === 'number' && h.fd >= 0) {
+ } else if (typeof h.fd === 'number' && h.fd >= 0) {
listen(self, null, null, null, backlog, h.fd);
} else {
throw new Error('Invalid listen argument: ' + h);
@@ -0,0 +1,36 @@
+// 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 common = require('../common');
+var assert = require('assert');
+var net = require('net');
+
+var gotError = false;
+
+process.on('exit', function() {
+ assert.equal(gotError, true);
+});
+
+// this should fail with an async EINVAL error, not throw an exception
+net.createServer(assert.fail).listen({fd:0}).on('error', function(e) {
+ assert.equal(e.code, 'EINVAL');
+ gotError = true;
+});

0 comments on commit 34c750d

Please sign in to comment.