aboutsummaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/request/index.js
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-05-06 15:22:02 -0700
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-05-10 14:45:28 -0400
commit5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb (patch)
tree6165b1b2ee92982a1e157ac29c924b516771780d /deps/npm/node_modules/request/index.js
parent101dd1ed789175311ab22f9a32dfc480f127bc68 (diff)
downloadandroid-node-v8-5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb.tar.gz
android-node-v8-5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb.tar.bz2
android-node-v8-5c36cfc8438d28ee5050ee6d5c383cf9c5b895fb.zip
deps: upgrade npm to 3.8.9
Contains the following three npm releases: https://github.com/npm/npm/releases/tag/v3.8.7 https://github.com/npm/npm/releases/tag/v3.8.8 https://github.com/npm/npm/releases/tag/v3.8.9 PR-URL: https://github.com/nodejs/node/pull/6664 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules/request/index.js')
-rwxr-xr-xdeps/npm/node_modules/request/index.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/deps/npm/node_modules/request/index.js b/deps/npm/node_modules/request/index.js
index 4d0c748da5..911a90dbb5 100755
--- a/deps/npm/node_modules/request/index.js
+++ b/deps/npm/node_modules/request/index.js
@@ -37,7 +37,7 @@ function initParams(uri, options, callback) {
extend(params, uri)
}
- params.callback = callback
+ params.callback = callback || params.callback
return params
}
@@ -56,7 +56,7 @@ function request (uri, options, callback) {
}
function verbFunc (verb) {
- var method = verb === 'del' ? 'DELETE' : verb.toUpperCase()
+ var method = verb.toUpperCase()
return function (uri, options, callback) {
var params = initParams(uri, options, callback)
params.method = method
@@ -70,7 +70,8 @@ request.head = verbFunc('head')
request.post = verbFunc('post')
request.put = verbFunc('put')
request.patch = verbFunc('patch')
-request.del = verbFunc('del')
+request.del = verbFunc('delete')
+request['delete'] = verbFunc('delete')
request.jar = function (store) {
return cookies.jar(store)
@@ -91,7 +92,7 @@ function wrapRequestMethod (method, options, requester, verb) {
target.pool = params.pool || options.pool
if (verb) {
- target.method = (verb === 'del' ? 'DELETE' : verb.toUpperCase())
+ target.method = verb.toUpperCase()
}
if (isFunction(requester)) {
@@ -114,7 +115,7 @@ request.defaults = function (options, requester) {
var defaults = wrapRequestMethod(self, options, requester)
- var verbs = ['get', 'head', 'post', 'put', 'patch', 'del']
+ var verbs = ['get', 'head', 'post', 'put', 'patch', 'del', 'delete']
verbs.forEach(function(verb) {
defaults[verb] = wrapRequestMethod(self[verb], options, requester, verb)
})