import Control.Monad
import Control.Monad.Trans.Maybe
import qualified Data.Attoparsec.Lazy as LP
+import Data.Attoparsec.Parsable
import qualified Data.ByteString as Strict
import qualified Data.ByteString.Lazy as Lazy
+import Data.Convertible.Base
+import Data.Convertible.Instances.Text ()
import Data.List
import Data.Maybe
import Data.Monoid.Unicode
import qualified Data.Sequence as S
-import qualified Data.Text as T
import Network.HTTP.Lucu.Abortion
import Network.HTTP.Lucu.Config
import Network.HTTP.Lucu.Chunk
| InChunk !Int -- ^Number of remaining octets in the current
-- chunk. It's always positive.
-requestReader ∷ HandleLike h
+requestReader ∷ (HostMapper hm, HandleLike h)
⇒ Config
- → HostMap
+ → hm
→ h
→ PortNumber
→ SockAddr
→ InteractionQueue
→ IO ()
-requestReader cnf sm h port addr tQueue
+requestReader cnf hm h port addr tQueue
= do input ← hGetLBS h
- acceptRequest (Context cnf sm h port addr tQueue) input
+ acceptRequest (Context cnf (hostMap hm) h port addr tQueue) input
`catches`
[ Handler handleAsyncE
, Handler handleOthers
if Lazy.null input then
return ()
else
- case LP.parse request input of
+ case LP.parse parser input of
LP.Done input' req → acceptParsableRequest ctx req input'
LP.Fail _ _ _ → acceptNonparsableRequest ctx
= let abo = mkAbortion BadRequest [("Connection", "close")]
$ Just
$ "chunkWasMalformed: "
- ⊕ T.pack msg
+ ⊕ cs msg
⊕ ": "
- ⊕ T.pack (intercalate ", " eCtx)
+ ⊕ cs (intercalate ", " eCtx)
⊕ ": "
- ⊕ T.pack e
+ ⊕ cs e
in
throwTo tid abo