1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "http/https: pass request to .createConnection()"

Browse Source 
This reverts commit 53716eb0b5338999761d115fad9d392077836e63.
This commit is contained in:
Fedor Indutny 2012-07-20 20:51:02 +04:00
parent eb2ca10462
commit e43fe5c833
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/http.js
View File

@ -1067,7 +1067,7 @@ Agent.prototype.addRequest = function(req, host, port, localAddress) {
} }
if (this.sockets[name].length < this.maxSockets) { if (this.sockets[name].length < this.maxSockets) {
// If we are under maxSockets create a new one. // If we are under maxSockets create a new one.
req.onSocket(this.createSocket(name, host, port, localAddress, req)); req.onSocket(this.createSocket(name, host, port, localAddress));
} else { } else {
// We are over limit so we'll add it to the queue. // We are over limit so we'll add it to the queue.
if (!this.requests[name]) { if (!this.requests[name]) {
@ -1076,13 +1076,13 @@ Agent.prototype.addRequest = function(req, host, port, localAddress) {
this.requests[name].push(req); this.requests[name].push(req);
} }
}; };
Agent.prototype.createSocket = function(name, host, port, localAddress, req) { Agent.prototype.createSocket = function(name, host, port, localAddress) {
var self = this; var self = this;
var options = util._extend({}, self.options); var options = util._extend({}, self.options);
options.port = port; options.port = port;
options.host = host; options.host = host;
options.localAddress = localAddress; options.localAddress = localAddress;
var s = self.createConnection.call(req, options); var s = self.createConnection(options);
if (!self.sockets[name]) { if (!self.sockets[name]) {
self.sockets[name] = []; self.sockets[name] = [];
} }
@ -1123,11 +1123,7 @@ Agent.prototype.removeSocket = function(s, name, host, port, localAddress) {
} }
if (this.requests[name] && this.requests[name].length) { if (this.requests[name] && this.requests[name].length) {
// If we have pending requests and a socket gets closed a new one // If we have pending requests and a socket gets closed a new one
this.createSocket(name, this.createSocket(name, host, port, localAddress).emit('free');
host,
port,
localAddress,
this.requests[name][0]).emit('free');
} }
}; };
@ -1139,7 +1135,6 @@ function ClientRequest(options, cb) {
var self = this; var self = this;
OutgoingMessage.call(self); OutgoingMessage.call(self);
this.options = util._extend({}, options);
self.agent = options.agent === undefined ? globalAgent : options.agent; self.agent = options.agent === undefined ? globalAgent : options.agent;
var defaultPort = options.defaultPort || 80; var defaultPort = options.defaultPort || 80;
@ -1199,7 +1194,7 @@ function ClientRequest(options, cb) {
self._last = true; self._last = true;
self.shouldKeepAlive = false; self.shouldKeepAlive = false;
if (options.createConnection) { if (options.createConnection) {
self.onSocket(options.createConnection.call(self, self.socketPath)); self.onSocket(options.createConnection(self.socketPath));
} else { } else {
self.onSocket(net.createConnection(self.socketPath)); self.onSocket(net.createConnection(self.socketPath));
} }
@ -1215,7 +1210,7 @@ function ClientRequest(options, cb) {
if (options.createConnection) { if (options.createConnection) {
options.port = port; options.port = port;
options.host = host; options.host = host;
var conn = options.createConnection.call(self, options); var conn = options.createConnection(options);
} else { } else {
var conn = net.createConnection({ var conn = net.createConnection({
port: port, port: port,

11
lib/https.js
View File

@ -21,8 +21,7 @@
var tls = require('tls'); var tls = require('tls');
var http = require('http'); var http = require('http');
var util = require('util'); var inherits = require('util').inherits;
var inherits = util.inherits;
function Server(opts, requestListener) { function Server(opts, requestListener) {
if (!(this instanceof Server)) return new Server(opts, requestListener); if (!(this instanceof Server)) return new Server(opts, requestListener);
@ -53,15 +52,15 @@ exports.createServer = function(opts, requestListener) {
// HTTPS agents. // HTTPS agents.
function createConnection(/* [port, host, options] */) { function createConnection(/* [port, host, options] */) {
var options = util._extend({}, this.options); var options = {};
if (typeof arguments[0] === 'object') { if (typeof arguments[0] === 'object') {
options = util._extend(options, arguments[0]); options = arguments[0];
} else if (typeof arguments[1] === 'object') { } else if (typeof arguments[1] === 'object') {
options = util._extend(options, arguments[1]); options = arguments[1];
options.port = arguments[0]; options.port = arguments[0];
} else if (typeof arguments[2] === 'object') { } else if (typeof arguments[2] === 'object') {
options = util._extend(options, arguments[2]); options = arguments[2];
options.port = arguments[0]; options.port = arguments[0];
options.host = arguments[1]; options.host = arguments[1];
} else { } else {