client: ensure response in case of Exception

Author: arnaudgeiser

src/aleph/http/client.clj

@@ -554,8 +554,11 @@
                             ;; might be different in case we use :multipart
                             (reset! save-body body))
 
-                          (netty/safe-execute ch
-                            (http/send-message ch true ssl? req' body))))
+                          (-> (netty/safe-execute ch
+                                                  (http/send-message ch true ssl? req' body))
+                              (d/catch' (fn [e]
+                                          (s/put! responses e)
+                                          (netty/close ch))))))
 
                       ;; this will usually happen because of a malformed request
                       (catch Throwable e

src/aleph/http/core.clj

@@ -539,7 +539,8 @@
                 (try
                   (send-streaming-body ch msg body)
                   (catch Throwable e
-                    (log/error e "error sending body of type " class-name)))))]
+                    (log/error e "error sending body of type " class-name)
+                    (throw e)))))]
 
       (when-not keep-alive?
         (handle-cleanup ch f))

test/aleph/http_test.clj

@@ -273,6 +273,13 @@
                                 {:body (io/file "test/file.txt")
                                  :pool client-pool}))))))))
 
+(deftest test-invalid-body
+  (let [client-url (str "http://localhost:" port)]
+    (with-handler identity
+      (is (thrown? IllegalArgumentException
+                   @(http-put client-url
+                              {:body 123}))))))
+
 (def characters
   (let [charset (conj (mapv char (range 32 127)) \newline)]
     (repeatedly #(rand-nth charset))))