net: fix .listen({fd:0})
This commit is contained in:
parent
6db9e12de5
commit
34c750d7a9
@ -980,7 +980,7 @@ Server.prototype.listen = function() {
|
|||||||
if (h instanceof TCP) {
|
if (h instanceof TCP) {
|
||||||
self._handle = h;
|
self._handle = h;
|
||||||
listen(self, null, -1, -1, backlog);
|
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);
|
listen(self, null, null, null, backlog, h.fd);
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid listen argument: ' + h);
|
throw new Error('Invalid listen argument: ' + h);
|
||||||
|
36
test/simple/test-net-listen-fd0.js
Normal file
36
test/simple/test-net-listen-fd0.js
Normal file
@ -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;
|
||||||
|
});
|
Loading…
x
Reference in New Issue
Block a user