Exodus to GHC 6.8.1

[Lucu.git] / Network / HTTP / Lucu / Preprocess.hs

diff --git a/Network/HTTP/Lucu/Preprocess.hs b/Network/HTTP/Lucu/Preprocess.hs
index ef6689892ca753f23909fe467932ef470589b669..7f386a7589ce4580bf6f23b3c61878914ba6822b 100644 (file)
--- a/Network/HTTP/Lucu/Preprocess.hs
+++ b/Network/HTTP/Lucu/Preprocess.hs
@@ -5,8 +5,8 @@ module Network.HTTP.Lucu.Preprocess
 
 import           Control.Concurrent.STM
 import           Control.Monad
-import           Data.ByteString.Base (ByteString)
-import qualified Data.ByteString.Char8 as C8
+import qualified Data.ByteString as Strict (ByteString)
+import qualified Data.ByteString.Char8 as C8 hiding (ByteString)
 import           Data.Char
 import           Data.Maybe
 import           Network.HTTP.Lucu.Config
@@ -75,7 +75,7 @@ preprocess itr
                   PUT  -> writeItr itr itrRequestHasBody True
                   _    -> setStatus NotImplemented
                   
-                preprocessHeader itr req
+                preprocessHeader req
     where
       setStatus :: StatusCode -> STM ()
       setStatus status
@@ -94,7 +94,7 @@ preprocess itr
                   do let conf = itrConfig itr
                          host = cnfServerHost conf
                          port = case cnfServerPort conf of
-                                  PortNumber n -> Just $ fromIntegral n
+                                  PortNumber n -> Just (fromIntegral n :: Int)
                                   _            -> Nothing
                          portStr
                               = case port of
@@ -115,11 +115,11 @@ preprocess itr
                        Nothing  -> setStatus BadRequest
 
 
-      parseHost :: ByteString -> (ByteString, ByteString)
+      parseHost :: Strict.ByteString -> (Strict.ByteString, Strict.ByteString)
       parseHost = C8.break (== ':')
 
 
-      updateAuthority :: ByteString -> ByteString -> STM ()
+      updateAuthority :: Strict.ByteString -> Strict.ByteString -> STM ()
       updateAuthority host portStr
           = host `seq` portStr `seq`
             updateItr itr itrRequest
@@ -135,9 +135,9 @@ preprocess itr
                                }
                 
 
-      preprocessHeader :: Interaction -> Request -> STM ()
-      preprocessHeader itr req
-          = itr `seq` req `seq`
+      preprocessHeader :: Request -> STM ()
+      preprocessHeader req
+          = req `seq`
             do case getHeader (C8.pack "Expect") req of
                  Nothing    -> return ()
                  Just value -> if value `noCaseEq` C8.pack "100-continue" then