summaryrefslogtreecommitdiff
path: root/lib/querystring.js
diff options
context:
space:
mode:
authorIgor Kalashnikov <igor.kalashnikov@me.com>2016-02-20 22:23:51 +0300
committerJames M Snell <jasnell@gmail.com>2016-04-11 22:37:37 -0700
commit5dafb435d8946805cbb25bccb1bfac31139915d1 (patch)
treea29aa7d373d3b21b0b8d158c716648969cbf60f7 /lib/querystring.js
parent59d23ad63dc75c68631480b2bdd98cbb67265d9d (diff)
downloadandroid-node-v8-5dafb435d8946805cbb25bccb1bfac31139915d1.tar.gz
android-node-v8-5dafb435d8946805cbb25bccb1bfac31139915d1.tar.bz2
android-node-v8-5dafb435d8946805cbb25bccb1bfac31139915d1.zip
querystring: using toString for objects on querystring.escape
This commit fixes an inconsistency in querystring.escape objects handling compared to native encodeURIComponent function. Fixes: https://github.com/nodejs/node/issues/5309 PR-URL: https://github.com/nodejs/node/pull/5341 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Brian White <mscdex@mscdex.net>
Diffstat (limited to 'lib/querystring.js')
-rw-r--r--lib/querystring.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/querystring.js b/lib/querystring.js
index ad1b5861a0..bacfc4bd70 100644
--- a/lib/querystring.js
+++ b/lib/querystring.js
@@ -90,8 +90,12 @@ for (var i = 0; i < 256; ++i)
QueryString.escape = function(str) {
// replaces encodeURIComponent
// http://www.ecma-international.org/ecma-262/5.1/#sec-15.1.3.4
- if (typeof str !== 'string')
- str += '';
+ if (typeof str !== 'string') {
+ if (typeof str === 'object')
+ str = String(str);
+ else
+ str += '';
+ }
var out = '';
var lastPos = 0;