Skip to content

Commit 04e2d26

Browse files
committed
Merge pull request request#727 from jchris/patch-1
fix requester bug
2 parents cdb075f + 0ec8209 commit 04e2d26

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

index.js

+14-8
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ request.defaults = function (options, requester) {
9393
return de
9494
}
9595

96+
function requester(params) {
97+
if(typeof params.options._requester === 'function') {
98+
return params.options._requester
99+
} else {
100+
return request
101+
}
102+
}
103+
96104
request.forever = function (agentOptions, optionsArg) {
97105
var options = {}
98106
if (optionsArg) {
@@ -109,17 +117,17 @@ request.get = request
109117
request.post = function (uri, options, callback) {
110118
var params = initParams(uri, options, callback)
111119
params.options.method = 'POST'
112-
return request(params.uri || null, params.options, params.callback)
120+
return requester(params)(params.uri || null, params.options, params.callback)
113121
}
114122
request.put = function (uri, options, callback) {
115123
var params = initParams(uri, options, callback)
116124
params.options.method = 'PUT'
117-
return request(params.uri || null, params.options, params.callback)
125+
return requester(params)(params.uri || null, params.options, params.callback)
118126
}
119127
request.patch = function (uri, options, callback) {
120128
var params = initParams(uri, options, callback)
121129
params.options.method = 'PATCH'
122-
return request(params.uri || null, params.options, params.callback)
130+
return requester(params)(params.uri || null, params.options, params.callback)
123131
}
124132
request.head = function (uri, options, callback) {
125133
var params = initParams(uri, options, callback)
@@ -130,15 +138,13 @@ request.head = function (uri, options, callback) {
130138
params.options.multipart) {
131139
throw new Error("HTTP HEAD requests MUST NOT include a request body.")
132140
}
133-
return request(params.uri || null, params.options, params.callback)
141+
142+
return requester(params)(params.uri || null, params.options, params.callback)
134143
}
135144
request.del = function (uri, options, callback) {
136145
var params = initParams(uri, options, callback)
137146
params.options.method = 'DELETE'
138-
if(typeof params.options._requester === 'function') {
139-
request = params.options._requester
140-
}
141-
return request(params.uri || null, params.options, params.callback)
147+
return requester(params)(params.uri || null, params.options, params.callback)
142148
}
143149
request.jar = function () {
144150
return new CookieJar

0 commit comments

Comments
 (0)