Add :content-length option to :responses

Author: weavejester

README.md

@@ -107,6 +107,9 @@ The following configuration keys are supported:
     Any redirects to relative URLs will be turned into redirects to
     absolute URLs, to better conform to the HTTP spec.
 
+  - `:conent-length` -
+    Adds the standard Ring [content-length][17] middleware.
+
   - `:content-types` -
     Adds the standard Ring [content-type][3] middleware.
 
@@ -194,6 +197,7 @@ The following configuration keys are supported:
 [14]: https://ring-clojure.github.io/ring/ring.middleware.file.html
 [15]: https://ring-clojure.github.io/ring/ring.middleware.resource.html
 [16]: https://ring-clojure.github.io/ring-websocket-middleware/ring.websocket.keepalive.html
+[17]: https://ring-clojure.github.io/ring/ring.middleware.content-length.html
 
 ## License
 

project.clj

@@ -4,7 +4,7 @@
   :license {:name "The MIT License"
             :url  "http://opensource.org/licenses/MIT"}
   :dependencies [[org.clojure/clojure "1.9.0"]
-                 [ring/ring-core "1.15.0"]
+                 [ring/ring-core "1.15.1"]
                  [ring/ring-ssl "0.4.0"]
                  [ring/ring-headers "0.4.0"]
                  [ring/ring-anti-forgery "1.4.0"]

src/ring/middleware/defaults.clj

@@ -13,6 +13,7 @@
             [ring.middleware.resource :refer [wrap-resource]]
             [ring.middleware.file :refer [wrap-file]]
             [ring.middleware.not-modified :refer [wrap-not-modified]]
+            [ring.middleware.content-length :refer [wrap-content-length]]
             [ring.middleware.content-type :refer [wrap-content-type]]
             [ring.middleware.default-charset :refer [wrap-default-charset]]
             [ring.middleware.absolute-redirects :refer [wrap-absolute-redirects]]
@@ -28,6 +29,7 @@
                :keywordize true}
    :responses {:not-modified-responses true
                :absolute-redirects     false
+               :content-length         true
                :content-types          true
                :default-charset        "utf-8"}})
 
@@ -54,6 +56,7 @@
    :static    {:resources "public"}
    :responses {:not-modified-responses true
                :absolute-redirects     false
+               :content-length         true
                :content-types          true
                :default-charset        "utf-8"}
    :websocket {:keepalive true}})
@@ -120,6 +123,7 @@
       (wrap wrap-content-type     (get-in config [:responses :content-types] false))
       (wrap wrap-default-charset  (get-in config [:responses :default-charset] false))
       (wrap wrap-not-modified     (get-in config [:responses :not-modified-responses] false))
+      (wrap wrap-content-length   (get-in config [:responses :content-length] false))
       (wrap wrap-x-headers        (:security config))
       (wrap wrap-hsts             (get-in config [:security :hsts] false))
       (wrap wrap-ssl-redirect     (get-in config [:security :ssl-redirect] false))

test/ring/middleware/defaults_test.clj

@@ -268,4 +268,21 @@
       (Thread/sleep 41)
       (wsp/on-close listener socket 1000 "")
       (Thread/sleep 20)
-      (is (= 4 @ping-count)))))
+      (is (= 4 @ping-count))))
+
+  (testing "content-length"
+    (let [handler (-> (constantly
+                       (-> (response "foobar")
+                           (content-type "text/plain; charset=UTF-8")))
+                      (wrap-defaults api-defaults))
+          resp    (handler (request :get "/"))]
+      (is (= resp {:status 200
+                   :headers {"Content-Type"   "text/plain; charset=UTF-8"
+                             "Content-Length" "6"}
+                   :body "foobar"})))
+    (let [handler (-> (constantly
+                       (-> (response "foobar")
+                           (content-type "text/plain; charset=UTF-8")))
+                      (wrap-defaults site-defaults))
+          resp    (handler (request :get "/"))]
+      (is (= "6" (get-in resp [:headers "Content-Length"]))))))