X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=Rakka%2FResource%2FRender.hs;h=3823cb4fa915f80be5b9c9c98e41a73f817fcadc;hp=c25ca586fc628cdafcd19dd176f19eec73342d3a;hb=df6079ca32f808d76c595e7953bff7a1dd46b10b;hpb=8c0fd38bb52a7b7cc69431df81c7736ddbb0faa6 diff --git a/Rakka/Resource/Render.hs b/Rakka/Resource/Render.hs index c25ca58..3823cb4 100644 --- a/Rakka/Resource/Render.hs +++ b/Rakka/Resource/Render.hs @@ -3,16 +3,15 @@ module Rakka.Resource.Render ) where -import qualified Codec.Binary.Base64 as B64 import Control.Arrow import Control.Arrow.ArrowIO import Control.Arrow.ArrowList import Control.Monad.Trans -import qualified Data.ByteString.Lazy as Lazy (ByteString, pack) -import qualified Data.ByteString.Lazy.Char8 as L8 hiding (ByteString) +import qualified Data.ByteString.Lazy as Lazy import Data.Maybe import Network.HTTP.Lucu import Network.HTTP.Lucu.Utils +import OpenSSL.EVP.Base64 import Rakka.Environment import Rakka.Page import Rakka.Utils @@ -68,7 +67,7 @@ handleRender env name let (bin, cType) = case cTypeM of Just (MIMEType "application" "x-rakka-base64-stream" _) - -> let b = Lazy.pack $ fromJust $ B64.decode $ L8.unpack entity + -> let b = decodeBase64LBS entity in (b, guessMIMEType b) Just t