Merge pull request #224 from egirshov/issue-162

parse empty form data
node-formidable · May 18, 2013 · 92e0854 · 92e0854
2 parents dda6abd + d8b60b2
commit 92e0854
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/lib/multipart_parser.js b/lib/multipart_parser.js
@@ -127,18 +127,25 @@ MultipartParser.prototype.write = function(buffer) {
         state = S.START_BOUNDARY;
       case S.START_BOUNDARY:
         if (index == boundary.length - 2) {
-          if (c != CR) {
+          if (c == HYPHEN) {
+            flags |= F.LAST_BOUNDARY;
+          } else if (c != CR) {
             return i;
           }
           index++;
           break;
         } else if (index - 1 == boundary.length - 2) {
-          if (c != LF) {
+          if (flags & F.LAST_BOUNDARY && c == HYPHEN){
+            callback('end');
+            state = S.END;
+            flags = 0;
+          } else if (!(flags & F.LAST_BOUNDARY) && c == LF) {
+            index = 0;
+            callback('partBegin');
+            state = S.HEADER_FIELD_START;
+          } else {
             return i;
           }
-          index = 0;
-          callback('partBegin');
-          state = S.HEADER_FIELD_START;
           break;
         }
 
@@ -260,6 +267,7 @@ MultipartParser.prototype.write = function(buffer) {
               callback('partEnd');
               callback('end');
               state = S.END;
+              flags = 0;
             } else {
               index = 0;
             }

diff --git a/test/fixture/http/misc/empty-multipart2.http b/test/fixture/http/misc/empty-multipart2.http
@@ -0,0 +1,6 @@
+POST /upload HTTP/1.1
+Host: localhost:8080
+Content-Type: multipart/form-data; boundary=----TLV0SrKD4z1TRxRhAPUvZ
+Content-Length: 31
+
+------TLV0SrKD4z1TRxRhAPUvZ--
diff --git a/test/fixture/js/misc.js b/test/fixture/js/misc.js
@@ -2,5 +2,6 @@ module.exports = {
   'empty.http': [],
   'empty-urlencoded.http': [],
   'empty-multipart.http': [],
+  'empty-multipart2.http': [],
   'minimal.http': [],
 };