mirror of https://github.com/lukechilds/node.git
Browse Source
This commit adds support for async createConnection() implementations and is still backwards compatible with synchronous createConnection() implementations. This commit also makes the http client more friendly with generic stream objects produced by createConnection() by checking stream.writable instead of stream.destroyed as the latter is currently a net.Socket-ism and not set by the core stream implementations. PR-URL: https://github.com/nodejs/node/pull/4638 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>process-exit-stdio-flushing
Brian White
9 years ago
4 changed files with 173 additions and 64 deletions
@ -1,27 +1,61 @@ |
|||||
'use strict'; |
'use strict'; |
||||
var common = require('../common'); |
const common = require('../common'); |
||||
var assert = require('assert'); |
const http = require('http'); |
||||
var http = require('http'); |
const net = require('net'); |
||||
var net = require('net'); |
const assert = require('assert'); |
||||
|
|
||||
var create = 0; |
const server = http.createServer(common.mustCall(function(req, res) { |
||||
var response = 0; |
|
||||
process.on('exit', function() { |
|
||||
assert.equal(1, create, 'createConnection() http option was not called'); |
|
||||
assert.equal(1, response, 'http server "request" callback was not called'); |
|
||||
}); |
|
||||
|
|
||||
var server = http.createServer(function(req, res) { |
|
||||
res.end(); |
res.end(); |
||||
response++; |
}, 4)).listen(common.PORT, '127.0.0.1', function() { |
||||
}).listen(common.PORT, '127.0.0.1', function() { |
let fn = common.mustCall(createConnection); |
||||
http.get({ createConnection: createConnection }, function(res) { |
http.get({ createConnection: fn }, function(res) { |
||||
res.resume(); |
res.resume(); |
||||
server.close(); |
fn = common.mustCall(createConnectionAsync); |
||||
|
http.get({ createConnection: fn }, function(res) { |
||||
|
res.resume(); |
||||
|
fn = common.mustCall(createConnectionBoth1); |
||||
|
http.get({ createConnection: fn }, function(res) { |
||||
|
res.resume(); |
||||
|
fn = common.mustCall(createConnectionBoth2); |
||||
|
http.get({ createConnection: fn }, function(res) { |
||||
|
res.resume(); |
||||
|
fn = common.mustCall(createConnectionError); |
||||
|
http.get({ createConnection: fn }, function(res) { |
||||
|
assert.fail(null, null, 'Unexpected response callback'); |
||||
|
}).on('error', common.mustCall(function(err) { |
||||
|
assert.equal(err.message, 'Could not create socket'); |
||||
|
server.close(); |
||||
|
})); |
||||
|
}); |
||||
|
}); |
||||
|
}); |
||||
}); |
}); |
||||
}); |
}); |
||||
|
|
||||
function createConnection() { |
function createConnection() { |
||||
create++; |
|
||||
return net.createConnection(common.PORT, '127.0.0.1'); |
return net.createConnection(common.PORT, '127.0.0.1'); |
||||
} |
} |
||||
|
|
||||
|
function createConnectionAsync(options, cb) { |
||||
|
setImmediate(function() { |
||||
|
cb(null, net.createConnection(common.PORT, '127.0.0.1')); |
||||
|
}); |
||||
|
} |
||||
|
|
||||
|
function createConnectionBoth1(options, cb) { |
||||
|
const socket = net.createConnection(common.PORT, '127.0.0.1'); |
||||
|
setImmediate(function() { |
||||
|
cb(null, socket); |
||||
|
}); |
||||
|
return socket; |
||||
|
} |
||||
|
|
||||
|
function createConnectionBoth2(options, cb) { |
||||
|
const socket = net.createConnection(common.PORT, '127.0.0.1'); |
||||
|
cb(null, socket); |
||||
|
return socket; |
||||
|
} |
||||
|
|
||||
|
function createConnectionError(options, cb) { |
||||
|
process.nextTick(cb, new Error('Could not create socket')); |
||||
|
} |
||||
|
Loading…
Reference in new issue