Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/s_exp/hirundo/http/response.clj
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,12 @@
[^ServerResponse server-response {:as response :keys [body headers status]}]
(set-headers! server-response headers)
(set-status! server-response status)
(write-body! server-response response body))
(if body
(write-body! server-response response body)
(.send server-response)))

(defn set-head-response!
[^ServerResponse server-response {:keys [headers status]}]
(set-headers! server-response headers)
(set-status! server-response status)
(.send server-response))
6 changes: 4 additions & 2 deletions src/s_exp/hirundo/http/routing.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
(into-array Handler
[(reify Handler
(handle [_ server-request server-response]
(let [response (handler (request/ring-request server-request server-response))]
(let [response (handler (request/ring-request server-request server-response))
head? (= (.method (.prologue server-request)) io.helidon.http.Method/HEAD)]
(cond->> response
(map? response)
(response/set-response! server-response)))))]))))))
((if head? response/set-head-response! response/set-response!)
server-response)))))]))))))

(defmethod options/set-server-option! :http-handler
[^WebServerConfig$Builder builder _ handler options]
Expand Down
5 changes: 4 additions & 1 deletion test/s_exp/hirundo_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@
(is (-> (client/get *endpoint*) :body (= "yes"))))

(with-server {:http-handler (fn [req] {:body (java.io.ByteArrayInputStream. (.getBytes "yes"))})}
(is (-> (client/get *endpoint*) :body (= "yes")))))
(is (-> (client/get *endpoint*) :body (= "yes"))))

(with-server {:http-handler (fn [req] {:body (java.io.ByteArrayInputStream. (.getBytes "yes"))})}
(is (-> (client/head *endpoint*) :body nil?))))

(deftest resp-map-decoding
(with-server {:http-handler (fn [req]
Expand Down
Loading