Merge pull request #203 from egirshov/fix-66

additional fix for empty requests
node-formidable · Mar 14, 2013 · 1605db0 · 1605db0
2 parents 55caee5 + 0b675be
commit 1605db0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/lib/incoming_form.js b/lib/incoming_form.js
@@ -276,9 +276,14 @@ IncomingForm.prototype._error = function(err) {
 };
 
 IncomingForm.prototype._parseContentLength = function() {
+  this.bytesReceived = 0;
   if (this.headers['content-length']) {
-    this.bytesReceived = 0;
     this.bytesExpected = parseInt(this.headers['content-length'], 10);
+  } else if (this.headers['transfer-encoding'] === undefined) {
+    this.bytesExpected = 0;
+  }
+
+  if (this.bytesExpected !== null) {
     this.emit('progress', this.bytesReceived, this.bytesExpected);
   }
 };

diff --git a/test/fixture/http/misc/minimal.http b/test/fixture/http/misc/minimal.http
@@ -0,0 +1,3 @@
+POST /upload HTTP/1.1
+Host: localhost:8080
+
diff --git a/test/fixture/js/misc.js b/test/fixture/js/misc.js
@@ -2,4 +2,5 @@ module.exports = {
   'empty.http': [],
   'empty-urlencoded.http': [],
   'empty-multipart.http': [],
+  'minimal.http': [],
 };
diff --git a/test/legacy/simple/test-incoming-form.js b/test/legacy/simple/test-incoming-form.js
@@ -378,9 +378,12 @@ test(function parseContentLength() {
   var HEADERS = {};
 
   form.headers = {};
+  gently.expect(form, 'emit', function(event, bytesReceived, bytesExpected) {
+    assert.equal(event, 'progress');
+    assert.equal(bytesReceived, 0);
+    assert.equal(bytesExpected, 0);
+  });
   form._parseContentLength();
-  assert.strictEqual(form.bytesReceived, null);
-  assert.strictEqual(form.bytesExpected, null);
 
   form.headers['content-length'] = '8';
   gently.expect(form, 'emit', function(event, bytesReceived, bytesExpected) {