--- #hide
module Network.HTTP.Lucu.Postprocess
( postprocess
, completeUnconditionalHeaders
import Control.Concurrent.STM
import Control.Monad
-import Data.Char
+import Data.ByteString.Base (ByteString)
+import qualified Data.ByteString.Char8 as C8
+import Data.IORef
import Data.Maybe
import GHC.Conc (unsafeIOToSTM)
import Network.HTTP.Lucu.Abortion
import Network.HTTP.Lucu.RFC1123DateTime
import Network.HTTP.Lucu.Request
import Network.HTTP.Lucu.Response
-import Network.HTTP.Lucu.Utils
import System.Time
+import System.IO.Unsafe
{-
* 304 Not Modified 以外の 3xx なのに Location ヘッダが無ければ 500 に
する。
- * Content-Length があれば、それを削除する。
+ * Content-Length があれば、それを削除する。Transfer-Encoding があって
+ も削除する。
- * HTTP/1.1 であり、且つ body を持つ事が出來る時、Transfer-Encoding の
- 最後の要素が chunked でなければ 500 Internal Error にする。
- Transfer-Encoding が未設定であれば、chunked に設定する。
-
- * HTTP/1.0 なのに Transfer-Encoding が設定濟なら 500 Internal Server
- Error にする。但し identity だけは許す。
+ * HTTP/1.1 であり、body を持つ事が出來る時、Transfer-Encoding を
+ chunked に設定する。
* body を持つ事が出來る時、Content-Type が無ければデフォルト値にする。
出來ない時、HEAD でなければContent-Type, Etag, Last-Modified を削除
postprocess :: Interaction -> STM ()
postprocess itr
- = do res <- readItr itr itrResponse id
+ = itr `seq`
+ do reqM <- readItr itr itrRequest id
+ res <- readItr itr itrResponse id
let sc = resStatus res
when (not $ any (\ p -> p sc) [isSuccessful, isRedirection, isError])
$ Just ("The status code is not good for a final status: "
++ show sc)
- when (sc == MethodNotAllowed && getHeader "Allow" res == Nothing)
+ when (sc == MethodNotAllowed && getHeader (C8.pack "Allow") res == Nothing)
$ abortSTM InternalServerError []
$ Just ("The status was " ++ show sc ++ " but no Allow header.")
- when (sc /= NotModified && isRedirection sc && getHeader "Location" res == Nothing)
+ when (sc /= NotModified && isRedirection sc && getHeader (C8.pack "Location") res == Nothing)
$ abortSTM InternalServerError []
$ Just ("The status code was " ++ show sc ++ " but no Location header.")
- when (itrRequest itr /= Nothing)
+ when (reqM /= Nothing)
$ relyOnRequest itr
- do newRes <- unsafeIOToSTM
- $ completeUnconditionalHeaders (itrConfig itr) res
+ -- itrResponse の内容は relyOnRequest によって變へられてゐる可
+ -- 能性が高い。
+ do oldRes <- readItr itr itrResponse id
+ newRes <- unsafeIOToSTM
+ $ completeUnconditionalHeaders (itrConfig itr) oldRes
writeItr itr itrResponse newRes
where
relyOnRequest :: Interaction -> STM ()
relyOnRequest itr
- = do status <- readItr itr itrResponse resStatus
+ = itr `seq`
+ do status <- readItr itr itrResponse resStatus
+ req <- readItr itr itrRequest fromJust
- let req = fromJust $ itrRequest itr
- reqVer = reqVersion req
+ let reqVer = reqVersion req
canHaveBody = if reqMethod req == HEAD then
False
else
status == ResetContent ||
status == NotModified )
- updateRes itr $ deleteHeader "Content-Length"
+ updateRes itr $! deleteHeader (C8.pack "Content-Length")
+ updateRes itr $! deleteHeader (C8.pack "Transfer-Encoding")
- cType <- readHeader itr "Content-Type"
+ cType <- readHeader itr (C8.pack "Content-Type")
when (cType == Nothing)
- $ updateRes itr $ setHeader "Content-Type" defaultPageContentType
+ $ updateRes itr $ setHeader (C8.pack "Content-Type") defaultPageContentType
if canHaveBody then
- do teM <- readHeader itr "Transfer-Encoding"
- if reqVer == HttpVersion 1 1 then
-
- do case teM of
- Nothing -> updateRes itr $ setHeader "Transfer-Encoding" "chunked"
- Just te -> let teList = [trim isWhiteSpace x
- | x <- splitBy (== ',') (map toLower te)]
- in
- when (teList == [] || last teList /= "chunked")
- $ abortSTM InternalServerError []
- $ Just ("Transfer-Encoding must end with `chunked' "
- ++ "because this is an HTTP/1.1 request: "
- ++ te)
-
- writeItr itr itrWillChunkBody True
- else
- case fmap (map toLower) teM of
- Nothing -> return ()
- Just "identity" -> return ()
- Just te -> abortSTM InternalServerError []
- $ Just ("Transfer-Encoding must be `identity' because "
- ++ "this is an HTTP/1.0 request: "
- ++ te)
+ when (reqVer == HttpVersion 1 1)
+ $ do updateRes itr $! setHeader (C8.pack "Transfer-Encoding") (C8.pack "chunked")
+ writeItr itr itrWillChunkBody True
else
-- body 関連のヘッダを削除。但し HEAD なら Content-* は殘す
- do updateRes itr $ deleteHeader "Transfer-Encoding"
- when (reqMethod req /= HEAD)
- $ do updateRes itr $ deleteHeader "Content-Type"
- updateRes itr $ deleteHeader "Etag"
- updateRes itr $ deleteHeader "Last-Modified"
-
- conn <- readHeader itr "Connection"
- case fmap (map toLower) conn of
- Just "close" -> writeItr itr itrWillClose True
- _ -> return ()
+ 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")
+
+ conn <- readHeader itr (C8.pack "Connection")
+ case conn of
+ Nothing -> return ()
+ Just value -> if value `noCaseEq` C8.pack "close" then
+ writeItr itr itrWillClose True
+ else
+ return ()
willClose <- readItr itr itrWillClose id
when willClose
- $ updateRes itr $ setHeader "Connection" "close"
+ $ updateRes itr $! setHeader (C8.pack "Connection") (C8.pack "close")
when (reqMethod req == HEAD || not canHaveBody)
$ writeTVar (itrWillDiscardBody itr) True
- readHeader :: Interaction -> String -> STM (Maybe String)
+ readHeader :: Interaction -> ByteString -> STM (Maybe ByteString)
readHeader itr name
- = readItr itr itrResponse $ getHeader name
+ = itr `seq` name `seq`
+ readItr itr itrResponse $ getHeader name
updateRes :: Interaction -> (Response -> Response) -> STM ()
updateRes itr updator
- = updateItr itr itrResponse updator
+ = itr `seq` updator `seq`
+ updateItr itr itrResponse updator
completeUnconditionalHeaders :: Config -> Response -> IO Response
completeUnconditionalHeaders conf res
- = return res >>= compServer >>= compDate >>= return
+ = conf `seq` res `seq`
+ return res >>= compServer >>= compDate >>= return
where
compServer res
- = case getHeader "Server" res of
- Nothing -> return $ addHeader "Server" (cnfServerSoftware conf) res
+ = case getHeader (C8.pack "Server") res of
+ Nothing -> return $ setHeader (C8.pack "Server") (cnfServerSoftware conf) res
Just _ -> return res
compDate res
- = case getHeader "Date" res of
- Nothing -> do time <- getClockTime
- return $ addHeader "Date" (formatHTTPDateTime time) res
- Just _ -> return res
\ No newline at end of file
+ = case getHeader (C8.pack "Date") res of
+ Nothing -> do date <- getCurrentDate
+ return $ setHeader (C8.pack "Date") date res
+ Just _ -> return res
+
+
+cache :: IORef (ClockTime, ByteString)
+cache = unsafePerformIO $
+ newIORef (TOD 0 0, undefined)
+{-# NOINLINE cache #-}
+
+getCurrentDate :: IO ByteString
+getCurrentDate = do now@(TOD curSec _) <- getClockTime
+ (TOD cachedSec _, cachedStr) <- readIORef cache
+
+ if curSec == cachedSec then
+ return cachedStr
+ else
+ do let dateStr = C8.pack $ formatHTTPDateTime now
+ writeIORef cache (now, dateStr)
+ return dateStr
\ No newline at end of file
projects / Lucu.git / blobdiff