Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 0c470bccf1ec097ae600b6116e6244cb624dc00e 2 parents d98ef41 + bc0d07e
@mikeal mikeal authored
View
4 node_modules/form-data/package.json
@@ -17,8 +17,8 @@
},
"dependencies": {
"combined-stream": "0.0.3",
- "mime": "1.2.2",
- "async": "0.1.9"
+ "mime": "~1.2.2",
+ "async": "~0.1.9"
},
"devDependencies": {
"fake": "0.2.1",
View
1  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" }
}
View
3  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
View
1  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);
Please sign in to comment.
Something went wrong with that request. Please try again.