Permalink
Browse files

Fixed issues with multipart store defaults

  • Loading branch information...
1 parent 11a096e commit 8dc40e8f38c59c9a1275991d7b7522b620b3a180 @weavejester weavejester committed Jul 6, 2011
View
10 ring-core/src/ring/middleware/multipart_params.clj
@@ -62,8 +62,12 @@
(require (symbol (namespace sym)))
(find-var sym))
-(def default-store
- 'ring.middleware.multipart-params.temp-file/temp-file-store)
+(defn default-store
+ "Loads and returns a temporary file store."
+ []
+ (let [store 'ring.middleware.multipart-params.temp-file/temp-file-store
+ func (load-var store)]
+ (func)))
(defn wrap-multipart-params
"Middleware to parse multipart parameters from a request. Adds the
@@ -88,7 +92,7 @@
(:character-encoding request)
"UTF-8")
store (or (:store opts)
- (load-var default-store))
+ (default-store))
params (if (multipart-form? request)
(parse-multipart-params request encoding store)
{})
View
2 ring-core/src/ring/middleware/multipart_params/temp_file.clj
@@ -28,7 +28,7 @@
(defn temp-file-store
"Stores multipart file parameters as a temporary file."
- ([] (temp-file-store {:expire-in 3600}))
+ ([] (temp-file-store {:expires-in 3600}))
([{:keys [expires-in]}]
(fn [item]
(let [file-set (atom #{})

0 comments on commit 8dc40e8

Please sign in to comment.