Content-length on req is long; content-length in header is a String, …

…per Ring spec
pedestal · Dec 18, 2015 · c1dcb53 · c1dcb53
1 parent e0cff55
commit c1dcb53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/service/src/io/pedestal/http/impl/servlet_interceptor.clj b/service/src/io/pedestal/http/impl/servlet_interceptor.clj
@@ -208,7 +208,7 @@
     (if (neg? c)
       req-map
       (-> (assoc! req-map :content-length c)
-          (assoc! :headers (assoc headers "content-length" c))))))
+          (assoc! :headers (assoc headers "content-length" (str c)))))))
 
 (defn- add-character-encoding [req-map ^HttpServletRequest servlet-req]
   (if-let [e (.getCharacterEncoding servlet-req)]

diff --git a/service/src/io/pedestal/test.clj b/service/src/io/pedestal/test.clj
@@ -131,8 +131,8 @@
         (getHeaderNames [this] (enumerator (keys (get options :headers)) ::getHeaderNames))
         (getHeader [this header] (get-in options [:headers header]))
         ;;(getHeaders [this header] (enumerator (get-in options [:headers header]) ::getHeaders))
-        (getContentLength [this] (get-in options [:headers "Content-Length"] (int 0)))
-        (getContentLengthLong [this] (get-in options [:headers "Content-Length"] (long 0)))
+        (getContentLength [this] (Integer/parseInt (get-in options [:headers "Content-Length"] "0")))
+        (getContentLengthLong [this] (Long/parseLong (get-in options [:headers "Content-Length"] "0")))
         (getContentType [this] (get-in options [:headers "Content-Type"] ""))
         (getCharacterEncoding [this] "UTF-8")
         (setAttribute [this s obj] nil) ;; Needed for NIO testing (see Servlet Interceptor)