looser encoded parsing

chjj · Nov 23, 2011 · 97da149 · 97da149
1 parent 5bd2053
commit 97da149
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/lib/encoded.js b/lib/encoded.js
@@ -4,8 +4,15 @@
  */
 
 var EventEmitter = require('events').EventEmitter
-  , StringDecoder = require('string_decoder').StringDecoder
-  , set = require('./qs').set;
+  , StringDecoder = require('string_decoder').StringDecoder;
+
+var qs = require('./qs')
+  , unescape = qs.unescape
+  , set = qs.set;
+
+/**
+ * Character Constants
+ */
 
 var AMP = '&'.charCodeAt(0)
   , EQUAL = '='.charCodeAt(0);
@@ -84,7 +91,16 @@ Parser.prototype._parse = function(data) {
             j = i + 1;
             break;
           case AMP:
-            return this._error('Unexpected AMP.');
+            // they did this: ...&key&...
+            // no state change
+            // this.state = 'key';
+            this.buff += this.decode.write(data.slice(j, i));
+            this.key = unescape(this.buff);
+            this.emit('value', this.key, '');
+            this.buff = '';
+            this.key = '';
+            j = i + 1;
+            break;
         }
         break;
       case 'value':
@@ -98,6 +114,7 @@ Parser.prototype._parse = function(data) {
             j = i + 1;
             break;
           case EQUAL:
+            // this should be encoded
             return this._error('Unexpected EQUAL.');
         }
         break;
@@ -121,14 +138,6 @@ Parser.prototype.destroy = function() {
   this.readable = false;
 };
 
-var unescape = function(str) {
-  try {
-    str = decodeURIComponent(str.replace(/\+/g, ' '));
-  } finally {
-    return str.replace(/\0/g, '');
-  }
-};
-
 /**
  * Middleware
  */

diff --git a/lib/qs.js b/lib/qs.js
@@ -31,6 +31,10 @@ var unescape = function(str) {
   }
 };
 
+/**
+ * Nested Fields
+ */
+
 var set = function(field, part, parts) {
   var obj = parts
     , name = field.split('[')
@@ -64,8 +68,14 @@ var set = function(field, part, parts) {
   }
 };
 
+/**
+ * Expose
+ */
+
 exports = qs;
+
 exports.parse = qs;
 exports.set = set;
+exports.unescape = unescape;
 
 module.exports = exports;