Merge branch 'master' of github.com:mikeal/request

request · Sep 4, 2012 · 0c470bc · 0c470bc
2 parents d98ef41 + bc0d07e
commit 0c470bc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/node_modules/form-data/package.json b/node_modules/form-data/package.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
   { "url" : "http://github.com/mikeal/request/issues" }
 , "engines" : ["node >= 0.3.6"]
 , "main" : "./main"
+, "dependencies": { "form-data":"~0.0.3", "mime":"~1.2.7" }
 , "bundleDependencies": ["form-data", "mime"]
 , "scripts": { "test": "node tests/run.js" }
 }
diff --git a/tests/test-tunnel.js b/tests/test-tunnel.js
@@ -50,8 +50,9 @@ squid.on('exit', function (c) {
 
 setTimeout(function F () {
   if (!ready) return setTimeout(F, 100)
-  request({ uri: 'https://registry.npmjs.org/request/'
+  request({ uri: 'https://registry.npmjs.org/'
           , proxy: 'http://localhost:3128'
+          , strictSSL: true
           , ca: ca
           , json: true }, function (er, body) {
     hadError = er

diff --git a/tunnel.js b/tunnel.js
@@ -188,6 +188,7 @@ function createSecureSocket(options, cb) {
   TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
     // 0 is dummy port for v0.6
     var secureSocket = tls.connect(0, mergeOptions({}, self.options, {
+      servername: options.host,
       socket: socket
     }));
     cb(secureSocket);