Fixed parameter-parsing issue with non-UTF8-encoded data

@@ -47,7 +47,7 @@
   [request encoding]
   (merge-with merge request
     (if-let [body (and (urlencoded-form? request) (:body request))]
-      (let [params (parse-params (slurp body) encoding)]
+      (let [params (parse-params (slurp body :encoding encoding) encoding)]
         {:form-params params, :params params})
       {:form-params {}, :params {}})))
 

@@ -1,7 +1,10 @@
 (ns ring.util.test
   "Utilities for testing Ring components."
-  (:import (java.io ByteArrayInputStream)))
+  (:import java.io.ByteArrayInputStream))
 
-(defn string-input-stream [^String s]
+(defn string-input-stream
   "Returns a ByteArrayInputStream for the given String."
-  (ByteArrayInputStream. (.getBytes s)))
+  ([^String s]
+     (ByteArrayInputStream. (.getBytes s)))
+  ([^String s encoding]
+     (ByteArrayInputStream. (.getBytes s encoding))))

@@ -36,3 +36,11 @@
     (is (= {} (:query-params resp)))
     (is (= {} (:form-params resp)))
     (is (= {} (:params resp)))))
+
+(deftest wrap-params-encoding
+  (let [req  {:character-encoding "UTF-16"
+              :content-type "application/x-www-form-urlencoded"
+              :body (tu/string-input-stream "hello=world" "UTF-16")}
+        resp (wrapped-echo req)]
+    (is (= (:params resp) {"hello" "world"}))
+    (is (= (:form-params resp) {"hello" "world"}))))