Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/incoming_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ IncomingForm.prototype.parse = function(req, cb) {
})
.on('aborted', function() {
self.emit('aborted');
self._error(new Error('Request aborted'));
})
.on('data', function(buffer) {
self.write(buffer);
Expand Down Expand Up @@ -257,7 +258,7 @@ IncomingForm.prototype._parseContentType = function() {
};

IncomingForm.prototype._error = function(err) {
if (this.error) {
if (this.error || this.ended) {
return;
}

Expand Down
7 changes: 6 additions & 1 deletion test/integration/test-fixtures.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,17 @@ function uploadFixture(name, cb) {
parts.push({type: 'field', name: name, value: value});
})
.on('end', function() {
res.end('OK');
callback(null, parts);
});
});

var socket = net.createConnection(common.port);
var file = fs.createReadStream(common.dir.fixture + '/http/' + name);

file.pipe(socket);
file.pipe(socket, {end: false});
socket.on('data', function () {
socket.end();
});

}
1 change: 1 addition & 0 deletions test/legacy/simple/test-incoming-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ test(function parse() {
gently.expect(form, 'emit',function(event) {
assert.equal(event, 'aborted');
});
gently.expect(form, '_error');

emit.aborted();
})();
Expand Down
27 changes: 27 additions & 0 deletions test/standalone/test-connection-aborted.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
var assert = require('assert');
var http = require('http');
var net = require('net');
var formidable = require('../../lib/index');

var server = http.createServer(function (req, res) {
var form = new formidable.IncomingForm();
var aborted_received = false;
form.on('aborted', function () {
aborted_received = true;
});
form.on('error', function () {
assert(aborted_received, 'Error event should follow aborted');
server.close();
});
form.on('end', function () {
throw new Error('Unexpected "end" event');
});
form.parse(req);
}).listen(0, 'localhost', function () {
var client = net.connect(server.address().port);
client.write(
"POST / HTTP/1.1\r\n" +
"Content-Length: 70\r\n" +
"Content-Type: multipart/form-data; boundary=foo\r\n\r\n");
client.end();
});