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

This reverts commit 53716eb.
nodejs · Jul 20, 2012 · 1ccdde9 · 1ccdde9
1 parent 93d496a
commit 1ccdde9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/lib/http.js b/lib/http.js
@@ -1067,7 +1067,7 @@ Agent.prototype.addRequest = function(req, host, port, localAddress) {
   }
   if (this.sockets[name].length < this.maxSockets) {
     // 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 {
     // We are over limit so we'll add it to the queue.
     if (!this.requests[name]) {
@@ -1076,13 +1076,13 @@ Agent.prototype.addRequest = function(req, host, port, localAddress) {
     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 options = util._extend({}, self.options);
   options.port = port;
   options.host = host;
   options.localAddress = localAddress;
-  var s = self.createConnection.call(req, options);
+  var s = self.createConnection(options);
   if (!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 we have pending requests and a socket gets closed a new one
-    this.createSocket(name,
-                      host,
-                      port,
-                      localAddress,
-                      this.requests[name][0]).emit('free');
+    this.createSocket(name, host, port, localAddress).emit('free');
   }
 };
 
@@ -1139,7 +1135,6 @@ function ClientRequest(options, cb) {
   var self = this;
   OutgoingMessage.call(self);
 
-  this.options = util._extend({}, options);
   self.agent = options.agent === undefined ? globalAgent : options.agent;
 
   var defaultPort = options.defaultPort || 80;
@@ -1199,7 +1194,7 @@ function ClientRequest(options, cb) {
     self._last = true;
     self.shouldKeepAlive = false;
     if (options.createConnection) {
-      self.onSocket(options.createConnection.call(self, self.socketPath));
+      self.onSocket(options.createConnection(self.socketPath));
     } else {
       self.onSocket(net.createConnection(self.socketPath));
     }
@@ -1215,7 +1210,7 @@ function ClientRequest(options, cb) {
     if (options.createConnection) {
       options.port = port;
       options.host = host;
-      var conn = options.createConnection.call(self, options);
+      var conn = options.createConnection(options);
     } else {
       var conn = net.createConnection({
         port: port,

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