+{-# LANGUAGE
+ BangPatterns
+ , UnicodeSyntax
+ #-}
module Network.HTTP.Lucu.Postprocess
( postprocess
, completeUnconditionalHeaders
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.IORef
import Data.Maybe
+import Data.Time
+import qualified Data.Time.HTTP as HTTP
import GHC.Conc (unsafeIOToSTM)
import Network.HTTP.Lucu.Abortion
import Network.HTTP.Lucu.Config
import Network.HTTP.Lucu.Headers
import Network.HTTP.Lucu.HttpVersion
import Network.HTTP.Lucu.Interaction
-import Network.HTTP.Lucu.RFC1123DateTime
import Network.HTTP.Lucu.Request
import Network.HTTP.Lucu.Response
-import System.Time
import System.IO.Unsafe
{-
-}
postprocess :: Interaction -> STM ()
-postprocess itr
- = itr `seq`
- do reqM <- readItr itr itrRequest id
+postprocess !itr
+ = do reqM <- readItr itr itrRequest id
res <- readItr itr itrResponse id
let sc = resStatus res
- when (not $ any (\ p -> p sc) [isSuccessful, isRedirection, isError])
+ unless (any (\ p -> p sc) [isSuccessful, isRedirection, isError])
$ abortSTM InternalServerError []
$ Just ("The status code is not good for a final status: "
++ show sc)
$ abortSTM InternalServerError []
$ Just ("The status code was " ++ show sc ++ " but no Location header.")
- when (reqM /= Nothing)
- $ relyOnRequest itr
+ when (reqM /= Nothing) relyOnRequest
-- itrResponse の内容は relyOnRequest によって變へられてゐる可
-- 能性が高い。
$ completeUnconditionalHeaders (itrConfig itr) oldRes
writeItr itr itrResponse newRes
where
- relyOnRequest :: Interaction -> STM ()
- relyOnRequest itr
- = itr `seq`
- do status <- readItr itr itrResponse resStatus
+ relyOnRequest :: STM ()
+ relyOnRequest
+ = do status <- readItr itr itrResponse resStatus
req <- readItr itr itrRequest fromJust
let reqVer = reqVersion req
status == ResetContent ||
status == NotModified )
- updateRes itr $! deleteHeader (C8.pack "Content-Length")
- updateRes itr $! deleteHeader (C8.pack "Transfer-Encoding")
+ updateRes $! deleteHeader (C8.pack "Content-Length")
+ updateRes $! deleteHeader (C8.pack "Transfer-Encoding")
- cType <- readHeader itr (C8.pack "Content-Type")
+ cType <- readHeader (C8.pack "Content-Type")
when (cType == Nothing)
- $ updateRes itr $ setHeader (C8.pack "Content-Type") defaultPageContentType
+ $ updateRes $ setHeader (C8.pack "Content-Type") defaultPageContentType
if canHaveBody then
when (reqVer == HttpVersion 1 1)
- $ do updateRes itr $! setHeader (C8.pack "Transfer-Encoding") (C8.pack "chunked")
+ $ do updateRes $! setHeader (C8.pack "Transfer-Encoding") (C8.pack "chunked")
writeItr itr itrWillChunkBody True
else
-- body 関連のヘッダを削除。但し HEAD なら Content-* は殘す
when (reqMethod req /= HEAD)
- $ do updateRes itr $! deleteHeader (C8.pack "Content-Type")
- updateRes itr $! deleteHeader (C8.pack "Etag")
- updateRes itr $! deleteHeader (C8.pack "Last-Modified")
+ $ do updateRes $! deleteHeader (C8.pack "Content-Type")
+ updateRes $! deleteHeader (C8.pack "Etag")
+ updateRes $! deleteHeader (C8.pack "Last-Modified")
- conn <- readHeader itr (C8.pack "Connection")
+ conn <- readHeader (C8.pack "Connection")
case conn of
Nothing -> return ()
- Just value -> if value `noCaseEq` C8.pack "close" then
- writeItr itr itrWillClose True
- else
- return ()
+ Just value -> when (value `noCaseEq` C8.pack "close")
+ $ writeItr itr itrWillClose True
willClose <- readItr itr itrWillClose id
when willClose
- $ updateRes itr $! setHeader (C8.pack "Connection") (C8.pack "close")
+ $ updateRes $! setHeader (C8.pack "Connection") (C8.pack "close")
when (reqMethod req == HEAD || not canHaveBody)
$ writeTVar (itrWillDiscardBody itr) True
- readHeader :: Interaction -> ByteString -> STM (Maybe ByteString)
- readHeader itr name
- = itr `seq` name `seq`
- readItr itr itrResponse $ getHeader name
+ readHeader :: Strict.ByteString -> STM (Maybe Strict.ByteString)
+ readHeader !name
+ = readItr itr itrResponse $ getHeader name
- updateRes :: Interaction -> (Response -> Response) -> STM ()
- updateRes itr updator
- = itr `seq` updator `seq`
- updateItr itr itrResponse updator
+ updateRes :: (Response -> Response) -> STM ()
+ updateRes !updator
+ = updateItr itr itrResponse updator
completeUnconditionalHeaders :: Config -> Response -> IO Response
-completeUnconditionalHeaders conf res
- = conf `seq` res `seq`
- return res >>= compServer >>= compDate >>= return
+completeUnconditionalHeaders !conf !res
+ = compServer res >>= compDate
where
- compServer res
- = case getHeader (C8.pack "Server") res of
- Nothing -> return $ setHeader (C8.pack "Server") (cnfServerSoftware conf) res
- Just _ -> return res
+ compServer res'
+ = case getHeader (C8.pack "Server") res' of
+ Nothing -> return $ setHeader (C8.pack "Server") (cnfServerSoftware conf) res'
+ Just _ -> return res'
- compDate res
- = case getHeader (C8.pack "Date") res of
+ compDate res'
+ = case getHeader (C8.pack "Date") res' of
Nothing -> do date <- getCurrentDate
- return $ setHeader (C8.pack "Date") date res
- Just _ -> return res
+ return $ setHeader (C8.pack "Date") date res'
+ Just _ -> return res'
-cache :: IORef (ClockTime, ByteString)
+cache :: IORef (UTCTime, Strict.ByteString)
cache = unsafePerformIO $
- newIORef (TOD 0 0, undefined)
+ newIORef (UTCTime (ModifiedJulianDay 0) 0, undefined)
{-# NOINLINE cache #-}
-getCurrentDate :: IO ByteString
-getCurrentDate = do now@(TOD curSec _) <- getClockTime
- (TOD cachedSec _, cachedStr) <- readIORef cache
+getCurrentDate :: IO Strict.ByteString
+getCurrentDate = do now <- getCurrentTime
+ (cachedTime, cachedStr) <- readIORef cache
- if curSec == cachedSec then
+ if now `mostlyEq` cachedTime then
return cachedStr
else
- do let dateStr = C8.pack $ formatHTTPDateTime now
+ do let dateStr = C8.pack $ HTTP.format now
writeIORef cache (now, dateStr)
- return dateStr
\ No newline at end of file
+ return dateStr
+ where
+ mostlyEq :: UTCTime -> UTCTime -> Bool
+ mostlyEq a b
+ = (utctDay a == utctDay b)
+ &&
+ (fromEnum (utctDayTime a) == fromEnum (utctDayTime b))
projects / Lucu.git / blobdiff