Skip to content

Commit

Permalink
handle trailing slashes (#788)
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLortex committed Jan 4, 2023
1 parent 2954572 commit 5c5a51e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
10 changes: 10 additions & 0 deletions lib/middleware.ml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,14 @@ struct
~headers:(Dream.all_headers response)
(Dream.status response)
| _ -> handler request

let no_trailing_slash next_handler request =
let target = Dream.target request in
match target with
| "/" -> next_handler request
| _ ->
let length = String.length target in
if target.[length - 1] = '/' then
Dream.redirect request (String.sub target 0 (length - 1))
else next_handler request
end
5 changes: 4 additions & 1 deletion lib/mirageio.ml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ struct
let router = Dream.router routes
end

let router = Dream.logger @@ Middleware.head @@ Router.router
let router =
Dream.logger @@ Middleware.no_trailing_slash @@ Middleware.head
@@ Router.router

let http ?(port = 80) stack = Dream.http ~port (Stack.tcp stack) router

let https ?(port = 443) ?tls stack =
Expand Down

0 comments on commit 5c5a51e

Please sign in to comment.