slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: prevent an infinite redirect when custom base url has a trailing slash

Browse Source
This commit is contained in:
Simon Michael 2011-09-20 15:23:55 +00:00
parent 85b2307e78
commit 15c39ac6c9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-web/Hledger/Web/Options.hs
View File

@ -56,9 +56,11 @@ toWebOpts rawopts = do
let p = fromMaybe defport $ maybeintopt "port" rawopts let p = fromMaybe defport $ maybeintopt "port" rawopts
return defwebopts { return defwebopts {
port_ = p port_ = p
,base_url_ = fromMaybe (defbaseurl p) $ maybestringopt "base-url" rawopts ,base_url_ = maybe (defbaseurl p) stripTrailingSlash $ maybestringopt "base-url" rawopts
,cliopts_ = cliopts ,cliopts_ = cliopts
} }
where
stripTrailingSlash = reverse . dropWhile (=='/') . reverse -- yesod don't like it
checkWebOpts :: WebOpts -> IO WebOpts checkWebOpts :: WebOpts -> IO WebOpts
checkWebOpts opts = do checkWebOpts opts = do