Merge branch 'master' into iojs-tests

.travis.yml

@@ -1,8 +1,12 @@
 language: node_js
 node_js:
-  - "0.8"
   - "0.10"
-before_install: npm install -g npm@~1.4.6
+  - "0.12"
+  - "io.js"
+matrix:
+  allow_failures:
+    - node_js: "0.12"
+    - node_js: "io.js"
 after_script: ./node_modules/.bin/istanbul cover ./node_modules/tape/bin/tape tests/test-*.js --report lcovonly && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js --verbose
 webhooks:
   urls: https://webhooks.gitter.im/e/237280ed4796c19cc626

README.md

@@ -633,6 +633,7 @@ The first argument can be either a `url` or an `options` object. The only requir
   tunneling proxy.
 * `proxyHeaderExclusiveList` - A whitelist of headers to send
   exclusively to a tunneling proxy and not to destination.
+* `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`).
 
 
 The callback argument gets 3 arguments:

index.js

@@ -47,56 +47,23 @@ function request (uri, options, callback) {
   options.callback = params.callback
   options.uri = params.uri
 
-  return new request.Request(options)
-}
-
-function requester(params) {
-  if(typeof params.options._requester === 'function') {
-    return params.options._requester
-  }
-  return request
-}
-
-request.get = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'GET'
-  return requester(params)(params.uri || null, params.options, params.callback)
-}
-
-request.head = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'HEAD'
-
-  if (paramsHaveRequestBody(params)) {
+  if (params.options.method === 'HEAD' && paramsHaveRequestBody(params)) {
     throw new Error('HTTP HEAD requests MUST NOT include a request body.')
   }
 
-  return requester(params)(params.uri || null, params.options, params.callback)
-}
-
-request.post = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'POST'
-  return requester(params)(params.uri || null, params.options, params.callback)
+  return new request.Request(options)
 }
 
-request.put = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'PUT'
-  return requester(params)(params.uri || null, params.options, params.callback)
-}
+var verbs = ['get', 'head', 'post', 'put', 'patch', 'del']
 
-request.patch = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'PATCH'
-  return requester(params)(params.uri || null, params.options, params.callback)
-}
-
-request.del = function (uri, options, callback) {
-  var params = initParams(uri, options, callback)
-  params.options.method = 'DELETE'
-  return requester(params)(params.uri || null, params.options, params.callback)
-}
+verbs.forEach(function(verb){
+  var method = verb === 'del' ? 'DELETE' : verb.toUpperCase()
+  request[verb] = function(uri, options, callback){
+    var params = initParams(uri, options, callback)
+    params.options.method = method
+    return this(params.uri || null, params.options, params.callback)
+  }
+})
 
 request.jar = function (store) {
   return cookies.jar(store)
@@ -107,6 +74,12 @@ request.cookie = function (str) {
 }
 
 request.defaults = function (options, requester) {
+
+  if (typeof options === 'function') {
+    requester = options
+    options = {}
+  }
+
   var self = this
   var wrap = function (method) {
     var headerlessOptions = function (options) {
@@ -131,25 +104,21 @@ request.defaults = function (options, requester) {
       }
 
       if (isFunction(requester)) {
-        if (method === self) {
-          method = requester
-        } else {
-          params.options._requester = requester
-        }
+        method = requester
       }
 
       return method(params.options, params.callback)
     }
   }
 
   var defaults      = wrap(self)
-  defaults.get      = wrap(self.get)
-  defaults.patch    = wrap(self.patch)
-  defaults.post     = wrap(self.post)
-  defaults.put      = wrap(self.put)
-  defaults.head     = wrap(self.head)
-  defaults.del      = wrap(self.del)
-  defaults.cookie   = wrap(self.cookie)
+  defaults.get      = self.get
+  defaults.patch    = self.patch
+  defaults.post     = self.post
+  defaults.put      = self.put
+  defaults.head     = self.head
+  defaults.del      = self.del
+  defaults.cookie   = self.cookie
   defaults.jar      = self.jar
   defaults.defaults = self.defaults
   return defaults

lib/multipart.js

@@ -21,14 +21,14 @@ Multipart.prototype.isChunked = function (options) {
     throw new Error('Argument error, options.multipart.')
   }
 
-  if (self.request.getHeader('transfer-encoding') === 'chunked') {
-    chunked = true
-  }
-
   if (options.chunked !== undefined) {
     chunked = options.chunked
   }
 
+  if (self.request.getHeader('transfer-encoding') === 'chunked') {
+    chunked = true
+  }
+
   if (!chunked) {
     parts.forEach(function (part) {
       if(typeof part.body === 'undefined') {
@@ -51,11 +51,16 @@ Multipart.prototype.setHeaders = function (chunked) {
   }
 
   var header = self.request.getHeader('content-type')
-  var contentType = (!header || header.indexOf('multipart') === -1)
-    ? 'multipart/related'
-    : header.split(';')[0]
 
-  self.request.setHeader('content-type', contentType + '; boundary=' + self.boundary)
+  if (!header || header.indexOf('multipart') === -1) {
+    self.request.setHeader('content-type', 'multipart/related; boundary=' + self.boundary)
+  } else {
+    if (header.indexOf('boundary') !== -1) {
+      self.boundary = header.replace(/.*boundary=([^\s;])+.*/, '$1')
+    } else {
+      self.request.setHeader('content-type', header + '; boundary=' + self.boundary)
+    }
+  }
 }
 
 Multipart.prototype.build = function (parts, chunked) {

lib/redirect.js

@@ -12,6 +12,7 @@ function Redirect (request) {
   this.maxRedirects = 10
   this.redirects = []
   this.redirectsFollowed = 0
+  this.removeRefererHeader = false
 }
 
 Redirect.prototype.onRequest = function () {
@@ -33,6 +34,9 @@ Redirect.prototype.onRequest = function () {
   if (self.followRedirects || self.followAllRedirects) {
     self.redirects = self.redirects || []
   }
+  if (request.removeRefererHeader !== undefined) {
+    self.removeRefererHeader = request.removeRefererHeader
+  }
 }
 
 Redirect.prototype.redirectTo = function (response) {
@@ -136,6 +140,10 @@ Redirect.prototype.onResponse = function (response) {
     }
   }
 
+  if (!self.removeRefererHeader) {
+    request.setHeader('referer', request.uri.href)
+  }
+
   request.emit('redirect')
 
   request.init()

request.js

@@ -322,7 +322,9 @@ Request.prototype.init = function (options) {
   if (!self.method) {
     self.method = options.method || 'GET'
   }
-  self.localAddress = options.localAddress
+  if (!self.localAddress) {
+    self.localAddress = options.localAddress
+  }
 
   if (!self.qsLib) {
     self.qsLib = (options.useQuerystring ? querystring : qs)

tests/ssl/ca/client-enc.key

@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,E95AEBB470632DA50EC1ABAB7F2D7A2A
+DEK-Info: AES-128-CBC,849C363BAF8E1693D5464248A4AFD61A
 
-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
+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
 -----END RSA PRIVATE KEY-----

tests/ssl/ca/client.crt

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDLjCCApcCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMC
+MIIDLjCCApcCCQCt9iAWqkDJwzANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
 VVMxCzAJBgNVBAgTAkNBMRAwDgYDVQQHEwdPYWtsYW5kMRAwDgYDVQQKEwdyZXF1
 ZXN0MSYwJAYDVQQLEx1yZXF1ZXN0IENlcnRpZmljYXRlIEF1dGhvcml0eTESMBAG
 A1UEAxMJcmVxdWVzdENBMSYwJAYJKoZIhvcNAQkBFhdtaWtlYWxAbWlrZWFscm9n
-ZXJzLmNvbTAeFw0xNTAxMjYyMTAxMjNaFw0xNTAyMjUyMTAxMjNaMIGPMQswCQYD
+ZXJzLmNvbTAeFw0xNTAyMjQwMzIwNDNaFw0xNTAzMjYwMzIwNDNaMIGPMQswCQYD
 VQQGEwJVUzELMAkGA1UECBMCQ0ExEDAOBgNVBAcTB09ha2xhbmQxEDAOBgNVBAoT
 B3JlcXVlc3QxGjAYBgNVBAsUEXJlcXVlc3RAbG9jYWxob3N0MRMwEQYDVQQDEwpU
 ZXN0Q2xpZW50MR4wHAYJKoZIhvcNAQkBFg9kby5ub3RAZW1haWwubWUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJDnEzgWpgsEyQcMQnkTTm7uFNKYOM
-76RID4bdK2pHbFlW4ZEWC//RFee4XkAzI4Yqa0thSaQBlm/ZrQD5w82XlHNUMtAu
-CJPfIMGKUYSBv8L26Bj23X8Hju1n8bdvyqAmLh0rvLvHF0g8AitpiQvn+DAhnV7A
-st5a87mUbCoBtETmnOZ1HQk8eIJ+3kZ0WaTmJy3WY8lP+LA64qLOC7kpIKkeBJUT
-ndnedd8gnq87Ale1XwLILUxN1hEfbBXLG2qxr8YDyUzntQMAEDNwJP8ikCcm8Yia
-+Ftp7vuioVtwR9G4lTn+3LYwDV2mki2IAjZ0bTVowJXFu6Aw9uLmm9NpAgMBAAEw
-DQYJKoZIhvcNAQEFBQADgYEAsmRaJf+axYufn9vLB5nh94vRsMSSLe5ARrWl0btT
-BZil51V0zvBwU502AVjxhzYmWGwEJuuChsnOv3rf/km5EmDo/yYN1ZEIZZEKGPQ1
-U7GMMJkrT1aBplPI/97CjuZkJYhBKpXMvi0yb4leJfYIORSyegPsDOEpaKMKDcDO
-QWw=
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDedUp5BgI+5UwtA8dk05fri2NJTQT8
+/v3gdzA/6mqSZENquJGV4230iay6JDiJRNnID/0cYQrjx+LtxoOcSWcuRYzIIIPr
+rlcg6EdukPMky0S6ToOZ+BEgpyqDno2NenIPBfx1B51qdz00NcbZ8X4KPhBa+sx6
+ituNVWHPusSKfgeC59NmX/3XQTM6qT8fo0wiOY8XOBJ/tDI+A6EsaIhnhtX/ZwNA
+8EbMDv924Y5QsJv29FAclLNnFV8UDlzWM3v00SWnWL2XWkNZiTKQF2dfcQnSHLaq
+HgqA7NJlxkh4uEu57f8B3CuF4V7Qw+1uHbSUjv6P97YWFHHaggaYtQunAgMBAAEw
+DQYJKoZIhvcNAQELBQADgYEAqtIehtQ+wfpOlF9inePBMmuMpd/VQ5Z1tQ25mqfo
+NbmV6M6BEd26IVn+CAUmy+Gyh4PZXd03jp74HkSkMmdsIuva7n1/6SQ9O1ssqj/r
+p+y8pzgabMId+WfBxpQkLzGDjNY8UPogARO1FcOog/81s0HbhLug098LaIIWjIl9
+d/w=
 -----END CERTIFICATE-----

tests/ssl/ca/client.csr

@@ -2,17 +2,17 @@
 MIIC+DCCAeACAQAwgY8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEQMA4GA1UE
 BxMHT2FrbGFuZDEQMA4GA1UEChMHcmVxdWVzdDEaMBgGA1UECxQRcmVxdWVzdEBs
 b2NhbGhvc3QxEzARBgNVBAMTClRlc3RDbGllbnQxHjAcBgkqhkiG9w0BCQEWD2Rv
-Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkO
-cTOBamCwTJBwxCeRNObu4U0pg4zvpEgPht0rakdsWVbhkRYL/9EV57heQDMjhipr
-S2FJpAGWb9mtAPnDzZeUc1Qy0C4Ik98gwYpRhIG/wvboGPbdfweO7Wfxt2/KoCYu
-HSu8u8cXSDwCK2mJC+f4MCGdXsCy3lrzuZRsKgG0ROac5nUdCTx4gn7eRnRZpOYn
-LdZjyU/4sDrios4LuSkgqR4ElROd2d513yCerzsCV7VfAsgtTE3WER9sFcsbarGv
-xgPJTOe1AwAQM3Ak/yKQJybxiJr4W2nu+6KhW3BH0biVOf7ctjANXaaSLYgCNnRt
-NWjAlcW7oDD24uab02kCAwEAAaAjMCEGCSqGSIb3DQEJBzEUExJwYXNzd29yZCBj
-aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBACEqC+TJTli7enf064IaIbaJvN2+
-KyHgOmWvjI3B/Sswb2E8gm2d5epPTH1BD62wv2TowHI9NvRwa6MVb1xrdDs5WAck
-EDvw9hUlv+9t5OXQXd0LmAzFVga3EjYCSdECKjiyTP71irBjmnxAYI/2cqE39xfw
-rGLXI1qOs+ivptaCAIJeHkNjf/z6EHQJE9F6OyGI6Mhg8GcoufI5xfV8FXjy8RBd
-Cz7uLocFxiQk9lwNwfL0ki5nrSWJOaa/1rY0q/sK/yHFLfapXEcE70vVr/hf05B/
-w8q4LgqU2PCELrFb0JKpT1L3lSXe17+AeYk2fi/SbHyVe53VY6rep/Y9yQ8=
+Lm5vdEBlbWFpbC5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN51
+SnkGAj7lTC0Dx2TTl+uLY0lNBPz+/eB3MD/qapJkQ2q4kZXjbfSJrLokOIlE2cgP
+/RxhCuPH4u3Gg5xJZy5FjMggg+uuVyDoR26Q8yTLRLpOg5n4ESCnKoOejY16cg8F
+/HUHnWp3PTQ1xtnxfgo+EFr6zHqK241VYc+6xIp+B4Ln02Zf/ddBMzqpPx+jTCI5
+jxc4En+0Mj4DoSxoiGeG1f9nA0DwRswO/3bhjlCwm/b0UByUs2cVXxQOXNYze/TR
+JadYvZdaQ1mJMpAXZ19xCdIctqoeCoDs0mXGSHi4S7nt/wHcK4XhXtDD7W4dtJSO
+/o/3thYUcdqCBpi1C6cCAwEAAaAjMCEGCSqGSIb3DQEJBzEUExJwYXNzd29yZCBj
+aGFsbGVuZ2UwDQYJKoZIhvcNAQELBQADggEBAH7qX1qNCZuW2xgD9+NqqkfFvNKQ
+SVWebn4VaMRg2O+1X8jN+e3pX+hmRiOOZNXzFNG9nkYbxFGM+Y3fNDleS0Hg9Vwq
+g4+cw2OGy2Uhhecr7sfvlG7/SgVZ/lN5UXcbM3eNb+/6GFRVzLoEWj8wmOpySI7k
+Io4oHLsusDNIpGEXz4yIv6R5PApjmd9TEGo7QEhYc+3KfDlp0v6YZFJHJdur1cxu
+GuaVagpI0bJzRmqGzad6P0bI7hLtv+lyUZlNA6g3aBEI7WmSoC91Gu2g4Kao19XD
+EeXjPL81D6Q8vhSEcq4Rdg7SEobpPUbREizBblHwXGavCRiBWsGE1AHyjeI=
 -----END CERTIFICATE REQUEST-----

tests/ssl/ca/client.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

tests/ssl/ca/gen-client.sh

@@ -20,4 +20,4 @@ openssl x509 -req \
     -out client.crt
 
 # Encrypt with password
-openssl rsa -aes128 -in client.key -out client-enc.key -passout 'password'
+openssl rsa -aes128 -in client.key -out client-enc.key -passout 'pass:password'