http: agent takes options instead of host, port pair

mikeal · ry · commit 2b03ba59177f · 2011-02-05T02:35:44.000-08:00
diff --git a/lib/http.js b/lib/http.js
@@ -959,10 +959,10 @@ function connectionListener(socket) {
 exports._connectionListener = connectionListener;
 
 
-
-function Agent(host, port) {
-  this.host = host;
-  this.port = port;
+function Agent(options) {
+  this.options = options;
+  this.host = options.host;
+  this.port = options.port;
 
   this.queue = [];
   this.sockets = [];
@@ -1228,7 +1228,7 @@ function getAgent(host, port) {
   var agent = agents[id];
 
   if (!agent) {
-    agent = agents[id] = new Agent(host, port);
+    agent = agents[id] = new Agent({ host: host, port: port });
   }
 
   return agent;
@@ -1248,7 +1248,7 @@ exports.request = function(options, cb) {
   if (options.agent === undefined) {
     options.agent = getAgent(options.host, options.port);
   } else if (options.agent === false) {
-    options.agent = new Agent(options.host, options.port);
+    options.agent = new Agent(options);
   }
   return exports._requestFromAgent(options, cb);
 };
diff --git a/lib/https.js b/lib/https.js
@@ -26,9 +26,7 @@ exports.createServer = function(opts, requestListener) {
 var agents = {};
 
 function Agent(options) {
-  http.Agent.call(this, options.host, options.port);
-
-  this.options = options;
+  http.Agent.call(this, options);
 }
 inherits(Agent, http.Agent);
 

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ exports.createServer = function(opts, requestListener) {`
`26`	`26`	`var agents = {};`
`27`	`27`
`28`	`28`	`function Agent(options) {`
`29`		`- http.Agent.call(this, options.host, options.port);`
`30`		`-`
`31`		`- this.options = options;`
	`29`	`+ http.Agent.call(this, options);`
`32`	`30`	`}`
`33`	`31`	`inherits(Agent, http.Agent);`
`34`	`32`