Skip to content

Don't override header and query defaults when using services; fix retry bug that garbled data on subsequent requests #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justincy wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Don't override header and query defaults when using services; fix retry bug that garbled data on subsequent requests #99

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91006f7
Mix default headers and query options with specific settings from the…
justincy Dec 4, 2012
946f58c
calling retry with post data string sends garbled data
justincy Dec 4, 2012
4c3814a
Don't catch all exceptions from request event handlers when trying to…
justincy Dec 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions lib/restler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ function Request(uri, options) {
console.log("Building multipart request without Content-Length header, please specify all file sizes");
}
} else {
if (typeof this.options.data == 'object') {
if (this.options.data instanceof Buffer) {
this.options.data = new Buffer(this.options.data.toString(), this.options.encoding || 'utf8');
}
else if (typeof this.options.data == 'object') {
this.options.data = qs.stringify(this.options.data);
this.headers['Content-Type'] = 'application/x-www-form-urlencoded';
this.headers['Content-Length'] = this.options.data.length;
}
if(typeof this.options.data == 'string') {
else if(typeof this.options.data == 'string') {
var buffer = new Buffer(this.options.data, this.options.encoding || 'utf8');
this.options.data = buffer;
this.headers['Content-Length'] = buffer.length;
Expand Down Expand Up @@ -229,7 +232,6 @@ mixin(Request.prototype, {
},
run: function() {
var self = this;

if (this.options.multipart) {
multipart.write(this.request, this.options.data, function() {
self.request.end();
Expand Down Expand Up @@ -368,12 +370,14 @@ var parsers = {
},
json: function(data, callback) {
if (data && data.length) {
var json = null,
err = null;
try {
callback(null, JSON.parse(data));
} catch (err) {
json = JSON.parse(data);
} catch (err) {
err.message = 'Failed to parse JSON body: ' + err.message;
callback(err, null);
}
callback(err, json);
} else {
callback(null, null);
}
Expand Down Expand Up @@ -470,6 +474,16 @@ mixin(Service.prototype, {
},
_withDefaults: function(options) {
var o = mixin({}, this.defaults);
if( options ) {
if(o.headers && options.headers) {
mixin(o.headers, options.headers);
delete options.headers;
}
if(o.query && options.query) {
mixin(o.query, options.query);
delete options.query;
}
}
return mixin(o, options);
}
});
Expand Down