Update FileUpload2 to 2.0.0-M2

Author: weavejester

ring-core/project.clj

@@ -9,7 +9,7 @@
                  [org.ring-clojure/ring-websocket-protocols "1.13.0"]
                  [ring/ring-codec "1.3.0"]
                  [commons-io "2.18.0"]
-                 [org.apache.commons/commons-fileupload2-core "2.0.0-M1"]
+                 [org.apache.commons/commons-fileupload2-core "2.0.0-M2"]
                  [crypto-random "1.2.1"]
                  [crypto-equality "1.0.1"]]
   :aliases {"test-all" ["with-profile" "default:+1.10:+1.11:+1.12" "test"]}

ring-core/src/ring/middleware/multipart_params.clj

@@ -30,9 +30,7 @@
 
 (defn- file-upload [request {:keys [progress-fn max-file-size]}]
   (doto (proxy [AbstractFileUpload] [])
-    ;; There seems to be an off-by-one bug in FileUpload 2.0.0-M1 that requires
-    ;; us to increment the max-file-size option to get it to work correctly.
-    (.setFileSizeMax (if max-file-size (inc max-file-size) -1))
+    (.setFileSizeMax (or max-file-size -1))
     (set-progress-listener request progress-fn)))
 
 (defn- multipart-form? [request]