321d6d2 · typeable/wai

git.iko.soy/typeable/wai

warp-static update

commit321d6d2a0133657ceb67605c069568f7e0d5d72c authorMichael Snoyman <michael@snoyman.com> dateTue 10 Jul 2012, 22:35 (14 years ago) parent873aea9

2 files changed+4−3

unifiedsplit

warp-static/warp-static.cabal+1

@@ -23,6 +23,7 @@ Executable warp

2323 , containers >= 0.2

2424 , bytestring >= 0.9.1.4

2525 , text >= 0.7 && < 0.12

26+ , mime-types >= 0.1 && < 0.2

2627

2728source-repository head

2829 type: git

warp-static/warp.hs+3−3

@@ -15,8 +15,8 @@ import qualified Data.ByteString.Char8 as S8

1515import Control.Arrow ((***))

1616import Data.Text (pack)

1717import Data.String (fromString)

18−import WaiAppStatic.Mime (defaultMimeMap, mimeByExt, defaultMimeType)

19−import WaiAppStatic.Types (ssIndices, toPiece, ssGetMimeType, fileName)

18+import Network.Mime (defaultMimeMap, mimeByExt, defaultMimeType)

19+import WaiAppStatic.Types (ssIndices, toPiece, ssGetMimeType, fileName, fromPiece)

2020import Data.Maybe (mapMaybe)

2121

2222data Args = Args

@@ -49,5 +49,5 @@ main = do

4949 , settingsHost = fromString host

5050 } $ middle $ staticApp (defaultFileServerSettings $ fromString docroot)

5151 { ssIndices = if noindex then [] else mapMaybe (toPiece . pack) index

52− , ssGetMimeType = return . mimeByExt mimeMap defaultMimeType . fileName

52+ , ssGetMimeType = return . mimeByExt mimeMap defaultMimeType . fromPiece . fileName

5353 }