X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Lucu.git;a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FMultipartForm.hs;h=8903d7f88d3c4736faccf4aaacf6c3d8361c98cd;hp=21fca67b8519f2a13d29c5c11cfbda6a116c5c18;hb=3d017dd65ddede9a11c5b7a34a91e04340e67bc4;hpb=e1e74c8f81ccbc57bf5a09987b0a9dd42648f020 diff --git a/Network/HTTP/Lucu/MultipartForm.hs b/Network/HTTP/Lucu/MultipartForm.hs index 21fca67..8903d7f 100644 --- a/Network/HTTP/Lucu/MultipartForm.hs +++ b/Network/HTTP/Lucu/MultipartForm.hs @@ -3,8 +3,8 @@ module Network.HTTP.Lucu.MultipartForm ) where -import Data.ByteString.Base (LazyByteString(..)) import qualified Data.ByteString.Char8 as C8 +import qualified Data.ByteString.Lazy.Char8 as L8 import Data.Char import Data.List import Network.HTTP.Lucu.Abortion @@ -78,13 +78,13 @@ partToPair part@(Part _ body) Nothing -> abortPurely BadRequest [] (Just "There is a part without Content-Disposition in the multipart/form-data.") - Just dispo - -> case parse contDispoP (LPS [dispo]) of + Just dispoStr + -> case parse contDispoP (L8.fromChunks [dispoStr]) of (# Success dispo, _ #) -> (getName dispo, body) (# _, _ #) -> abortPurely BadRequest [] - (Just $ "Unparsable Content-Disposition: " ++ C8.unpack dispo) + (Just $ "Unparsable Content-Disposition: " ++ C8.unpack dispoStr) where getName :: ContDispo -> String getName dispo@(ContDispo dType dParams)