RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: always parse json for compatability. fixes #146.

Browse Source
This commit is contained in:
Christopher Jeffrey 2017-02-28 05:26:48 -08:00
parent 96d093fb64
commit 49bb9ed0fa
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/http/base.js
View File

@ -154,6 +154,7 @@ HTTPBase.prototype.handleRequest = co(function* handleRequest(req, res) {
HTTPBase.prototype.parseBody = co(function* parseBody(req) { HTTPBase.prototype.parseBody = co(function* parseBody(req) {
var body = Object.create(null); var body = Object.create(null);
var type = req.contentType;
var data; var data;
if (req.method === 'GET') if (req.method === 'GET')
@ -164,7 +165,10 @@ HTTPBase.prototype.parseBody = co(function* parseBody(req) {
if (!data) if (!data)
return body; return body;
switch (req.contentType) { if (this.options.contentType)
type = this.options.contentType;
switch (type) {
case 'json': case 'json':
body = JSON.parse(data); body = JSON.parse(data);
break; break;
@ -507,6 +511,8 @@ function HTTPBaseOptions(options) {
this.keyLimit = 100; this.keyLimit = 100;
this.bodyLimit = 20 << 20; this.bodyLimit = 20 << 20;
this.contentType = null;
if (options) if (options)
this.fromOptions(options); this.fromOptions(options);
} }
@ -569,6 +575,11 @@ HTTPBaseOptions.prototype.fromOptions = function fromOptions(options) {
this.ssl = options.ssl; this.ssl = options.ssl;
} }
if (options.contentType != null) {
assert(typeof options.contentType === 'string');
this.contentType = options.contentType;
}
return this; return this;
}; };

1
lib/http/server.js
View File

@ -1734,6 +1734,7 @@ function HTTPOptions(options) {
this.key = null; this.key = null;
this.cert = null; this.cert = null;
this.ca = null; this.ca = null;
this.contentType = 'json';
this.fromOptions(options); this.fromOptions(options);
} }