Browse Source

Fix #1497 querystring: Replace 'in' test with 'hasOwnProperty'

v0.7.4-release
isaacs 14 years ago
parent
commit
ac4791393e
  1. 2
      lib/querystring.js
  2. 7
      test/simple/test-querystring.js

2
lib/querystring.js

@ -166,7 +166,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq) {
var k = QueryString.unescape(x[0], true);
var v = QueryString.unescape(x.slice(1).join(eq), true);
if (!(k in obj)) {
if (!obj.hasOwnProperty(k)) {
obj[k] = v;
} else if (!Array.isArray(obj[k])) {
obj[k] = [obj[k], v];

7
test/simple/test-querystring.js

@ -48,7 +48,12 @@ var qsTestCases = [
'undef': ''}],
[' foo = bar ', '%20foo%20=%20bar%20', {' foo ': ' bar '}],
['foo=%zx', 'foo=%25zx', {'foo': '%zx'}],
['foo=%EF%BF%BD', 'foo=%EF%BF%BD', {'foo': '\ufffd' }]
['foo=%EF%BF%BD', 'foo=%EF%BF%BD', {'foo': '\ufffd' }],
[ 'toString=foo&valueOf=bar&__defineGetter__=baz',
'toString=foo&valueOf=bar&__defineGetter__=baz',
{ toString: 'foo',
valueOf: 'bar',
__defineGetter__: 'baz' } ]
];
// [ wonkyQS, canonicalQS, obj ]

Loading…
Cancel
Save