From 5d7bff71780b97384d0c291d680fefa125a221fa Mon Sep 17 00:00:00 2001
From: Huruikagi <kbc14a04@stu.kawahara.ac.jp>
Date: Fri, 9 Jun 2017 11:05:18 +0900
Subject: [PATCH 1/2] Added a test for fileFilter.

---
 types/multer/multer-tests.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/multer/multer-tests.ts b/types/multer/multer-tests.ts
index 00cbc52b98..83c34da197 100644
--- a/types/multer/multer-tests.ts
+++ b/types/multer/multer-tests.ts
@@ -4,7 +4,12 @@
 import express = require('express');
 import multer = require('multer');
 
-var upload = multer({ dest: 'uploads/' });
+var upload = multer({
+    dest: 'uploads/',
+    fileFilter: (req, file, cb) => {
+        cb(null, true);
+    }
+});
 
 var app = express();
 

From 1691d92be2bc55761af2859bc254bf684c196687 Mon Sep 17 00:00:00 2001
From: Huruikagi <kbc14a04@stu.kawahara.ac.jp>
Date: Fri, 9 Jun 2017 11:09:49 +0900
Subject: [PATCH 2/2] Allow null in Options.fileFilter.callback first parameter

---
 types/multer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts
index 35e71a251d..bd9030292f 100644
--- a/types/multer/index.d.ts
+++ b/types/multer/index.d.ts
@@ -36,7 +36,7 @@ declare namespace multer {
             headerPairs?: number;
         };
         /** A function to control which files to upload and which to skip. */
-        fileFilter?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error, acceptFile: boolean) => void) => void;
+        fileFilter?: (req: Express.Request, file: Express.Multer.File, callback: (error: Error | null, acceptFile: boolean) => void) => void;
     }
 
     interface StorageEngine {