diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2012-07-20 20:51:02 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2012-07-20 20:51:02 +0400 |
| commit | e43fe5c833c941aba25bfdb6193ef41fc50ae405 (patch) | |
| tree | fbcc30ad06a900e1b86cb780983a2f6874064485 /lib/https.js | |
| parent | eb2ca104628e415fc73c330cdd76fca77bf5ba97 (diff) | |
| download | android-node-v8-e43fe5c833c941aba25bfdb6193ef41fc50ae405.tar.gz android-node-v8-e43fe5c833c941aba25bfdb6193ef41fc50ae405.tar.bz2 android-node-v8-e43fe5c833c941aba25bfdb6193ef41fc50ae405.zip | |
Revert "http/https: pass request to .createConnection()"
This reverts commit 53716eb0b5338999761d115fad9d392077836e63.
Diffstat (limited to 'lib/https.js')
| -rw-r--r-- | lib/https.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/https.js b/lib/https.js index ce431a127a..9778354007 100644 --- 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 { |