yesod-core 1.4.16 → 1.4.17

raw patch · 4 files changed

+18/−6 lines, 4 files

Files

• ChangeLog.md +4/−0
• Yesod/Core.hs +1/−0
• Yesod/Core/Class/Yesod.hs +12/−5
• yesod-core.cabal +1/−1

@@ -1,3 +1,7 @@+## 1.4.17++* Add `getApprootText`+ ## 1.4.16  * Add `guessApproot` and `guessApprootOr`

@@ -74,6 +74,7 @@       -- * Approot     , guessApproot     , guessApprootOr+    , getApprootText       -- * Misc     , yesodVersion     , yesodRender

@@ -844,13 +844,20 @@ guessApprootOr :: Approot site -> Approot site guessApprootOr fallback = ApprootRequest $ \master req ->     case W.requestHeaderHost req of-        Nothing -> case fallback of-                       ApprootRelative  -> ""-                       ApprootStatic t  -> t-                       ApprootMaster f  -> f master-                       ApprootRequest f -> f master req+        Nothing -> getApprootText fallback master req         Just host ->             (if Network.Wai.Request.appearsSecure req                 then "https://"                 else "http://")             `T.append` TE.decodeUtf8With TEE.lenientDecode host++-- | Get the textual application root from an 'Approot' value.+--+-- Since 1.4.17+getApprootText :: Approot site -> site -> W.Request -> Text+getApprootText ar site req =+    case ar of+        ApprootRelative -> ""+        ApprootStatic t -> t+        ApprootMaster f -> f site+        ApprootRequest f -> f site req

@@ -1,5 +1,5 @@ name:            yesod-core-version:         1.4.16+version:         1.4.17 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>