Fix wrap-content-length when given nil response

Author: weavejester

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

@@ -33,11 +33,12 @@
   "Adds a Content-Length header to the response. See: wrap-content-length."
   {:added "1.15"}
   [response]
-  (if (resp/get-header response "content-length")
-    response
-    (if-let [size (body-size-in-bytes (:body response) response)]
-      (-> response (resp/header "Content-Length" (str size)))
-      response)))
+  (when response
+    (if (resp/get-header response "content-length")
+      response
+      (if-let [size (body-size-in-bytes (:body response) response)]
+        (-> response (resp/header "Content-Length" (str size)))
+        response))))
 
 (defn wrap-content-length
   "Middleware that adds a Content-Length header to the response, if the

ring-core/test/ring/middleware/test/content_length.clj

@@ -28,10 +28,12 @@
                      :headers {}
                      :body (java.io.File. "test/ring/assets/plain.txt")})
                    (get-in [:headers "Content-Length"])))))
-  (testing "nil"
+  (testing "nil body"
     (is (= "0" (-> (content-length-response
                     {:status 200, :headers {}, :body nil})
                    (get-in [:headers "Content-Length"])))))
+  (testing "nil response"
+    (is (nil? (content-length-response nil))))
   (testing "other data"
     (is (nil? (-> (content-length-response
                    {:status 200