Skip to content
Open
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
16 changes: 15 additions & 1 deletion lib/make-middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ function makeMiddleware (setup) {
var options = setup()

var limits = options.limits
var busboyLimits = limits

if (limits && Object.prototype.hasOwnProperty.call(limits, 'fileSize')) {
busboyLimits = {}
var key
for (key in limits) {
busboyLimits[key] = limits[key]
}

if (typeof limits.fileSize === 'number' && isFinite(limits.fileSize)) {
busboyLimits.fileSize = limits.fileSize + 1
}
}

var storage = options.storage
var fileFilter = options.fileFilter
var fileStrategy = options.fileStrategy
Expand Down Expand Up @@ -126,7 +140,7 @@ function makeMiddleware (setup) {
try {
busboy = Busboy({
headers: req.headers,
limits: limits,
limits: busboyLimits,
preservePath: preservePath,
defParamCharset: defParamCharset
})
Expand Down
12 changes: 12 additions & 0 deletions test/error-handling.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ describe('Error Handling', function () {
})
})

it('should allow file that is exactly at file size limit', function (done) {
var form = new FormData()
var parser = multer({ storage: multer.memoryStorage(), limits: { fileSize: 1500 } }).single('small0')

form.append('small0', Buffer.alloc(1500), 'small0.txt')

util.submitForm(parser, form, function (err) {
assert.ifError(err)
done()
})
})

it('should respect file count limit', function (done) {
var form = new FormData()
var parser = withLimits({ files: 1 }, [
Expand Down