X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHeaders.hs;h=163f6bcf55bb2a9e4f78ef680919be07df354246;hb=f62b6f07bbf1eefcf552163d8f7daa6e0862ed5d;hp=c97c93cb652156c618d92bab8977fa2627fda117;hpb=15aa04a569fb13fb0793389f78f52b0255083cef;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Headers.hs b/Network/HTTP/Lucu/Headers.hs
index c97c93c..163f6bc 100644
--- a/Network/HTTP/Lucu/Headers.hs
+++ b/Network/HTTP/Lucu/Headers.hs
@@ -14,29 +14,31 @@ module Network.HTTP.Lucu.Headers
     )
     where
 
-import           Data.ByteString.Base (ByteString, toForeignPtr, w2c, inlinePerformIO)
-import qualified Data.ByteString.Char8 as C8
+import qualified Data.ByteString as Strict (ByteString)
+import           Data.ByteString.Internal (toForeignPtr, w2c, inlinePerformIO)
+import qualified Data.ByteString.Char8 as C8 hiding (ByteString)
 import           Data.Char
 import           Data.List
 import           Data.Map (Map)
 import qualified Data.Map as M
+import           Data.Ord
 import           Data.Word
 import           Foreign.ForeignPtr
 import           Foreign.Ptr
 import           Foreign.Storable
+import           Network.HTTP.Lucu.HandleLike
 import           Network.HTTP.Lucu.Parser
 import           Network.HTTP.Lucu.Parser.Http
 import           Network.HTTP.Lucu.Utils
-import           System.IO
 
-type Headers = Map NCBS ByteString
-newtype NCBS = NCBS ByteString
+type Headers = Map NCBS Strict.ByteString
+newtype NCBS = NCBS Strict.ByteString
 
-toNCBS :: ByteString -> NCBS
+toNCBS :: Strict.ByteString -> NCBS
 toNCBS = NCBS
 {-# INLINE toNCBS #-}
 
-fromNCBS :: NCBS -> ByteString
+fromNCBS :: NCBS -> Strict.ByteString
 fromNCBS (NCBS x) = x
 {-# INLINE fromNCBS #-}
 
@@ -49,11 +51,13 @@ instance Ord NCBS where
 instance Show NCBS where
     show (NCBS x) = show x
 
-noCaseCmp :: ByteString -> ByteString -> Ordering
-noCaseCmp a b = toForeignPtr a `cmp` toForeignPtr b
+noCaseCmp :: Strict.ByteString -> Strict.ByteString -> Ordering
+noCaseCmp a b = a `seq` b `seq`
+                toForeignPtr a `cmp` toForeignPtr b
     where
       cmp :: (ForeignPtr Word8, Int, Int) -> (ForeignPtr Word8, Int, Int) -> Ordering
       cmp (x1, s1, l1) (x2, s2, l2)
+          | x1 `seq` s1 `seq` l1 `seq` x2 `seq` s2 `seq` l2 `seq` False = undefined
           | l1 == 0  && l2 == 0               = EQ
           | x1 == x2 && s1 == s2 && l1 == l2  = EQ
           | otherwise
@@ -61,27 +65,30 @@ noCaseCmp a b = toForeignPtr a `cmp` toForeignPtr b
                 withForeignPtr x1 $ \ p1 ->
                 withForeignPtr x2 $ \ p2 ->
                 noCaseCmp' (p1 `plusPtr` s1) l1 (p2 `plusPtr` s2) l2
-{-# INLINE noCaseCmp #-}
+
 
 -- もし先頭の文字列が等しければ、短い方が小さい。
 noCaseCmp' :: Ptr Word8 -> Int -> Ptr Word8 -> Int -> IO Ordering
 noCaseCmp' p1 l1 p2 l2
+    | p1 `seq` l1 `seq` p2 `seq` l2 `seq` False = undefined
     | l1 == 0 && l2 == 0 = return EQ
-    | l1 == 0 && l1 /= 0 = return LT
-    | l1 /= 0 && l2 == 0 = return GT
+    | l1 == 0            = return LT
+    |            l2 == 0 = return GT
     | otherwise
         = do c1 <- peek p1
              c2 <- peek p2
-             case toLower (w2c c1) `compare` toLower (w2c c2) of
+             case comparing (toLower . w2c) c1 c2 of
                EQ -> noCaseCmp' (p1 `plusPtr` 1) (l1 - 1) (p2 `plusPtr` 1) (l2 - 1)
                x  -> return x
 
 
-noCaseEq :: ByteString -> ByteString -> Bool
-noCaseEq a b = toForeignPtr a `cmp` toForeignPtr b
+noCaseEq :: Strict.ByteString -> Strict.ByteString -> Bool
+noCaseEq a b = a `seq` b `seq`
+               toForeignPtr a `cmp` toForeignPtr b
     where
       cmp :: (ForeignPtr Word8, Int, Int) -> (ForeignPtr Word8, Int, Int) -> Bool
       cmp (x1, s1, l1) (x2, s2, l2)
+          | x1 `seq` s1 `seq` l1 `seq` x2 `seq` s2 `seq` l2 `seq` False = undefined
           | l1 /= l2                          = False
           | l1 == 0  && l2 == 0               = True
           | x1 == x2 && s1 == s2 && l1 == l2  = True
@@ -94,6 +101,7 @@ noCaseEq a b = toForeignPtr a `cmp` toForeignPtr b
 
 noCaseEq' :: Ptr Word8 -> Ptr Word8 -> Int -> IO Bool
 noCaseEq' p1 p2 l
+    | p1 `seq` p2 `seq` l `seq` False = undefined
     | l == 0    = return True
     | otherwise
         = do c1 <- peek p1
@@ -108,17 +116,17 @@ class HasHeaders a where
     getHeaders :: a -> Headers
     setHeaders :: a -> Headers -> a
 
-    getHeader :: ByteString -> a -> Maybe ByteString
+    getHeader :: Strict.ByteString -> a -> Maybe Strict.ByteString
     getHeader key a
         = key `seq` a `seq`
           M.lookup (toNCBS key) (getHeaders a)
 
-    deleteHeader :: ByteString -> a -> a
+    deleteHeader :: Strict.ByteString -> a -> a
     deleteHeader key a
         = key `seq` a `seq`
           setHeaders a $ M.delete (toNCBS key) (getHeaders a)
 
-    setHeader :: ByteString -> ByteString -> a -> a
+    setHeader :: Strict.ByteString -> Strict.ByteString -> a -> a
     setHeader key val a
         = key `seq` val `seq` a `seq`
           setHeaders a $ M.insert (toNCBS key) val (getHeaders a)
@@ -128,11 +136,28 @@ emptyHeaders :: Headers
 emptyHeaders = M.empty
 
 
-toHeaders :: [(ByteString, ByteString)] -> Headers
-toHeaders xs = M.fromList [(toNCBS a, b) | (a, b) <- xs]
+toHeaders :: [(Strict.ByteString, Strict.ByteString)] -> Headers
+toHeaders xs = mkHeaders xs M.empty
+
+
+mkHeaders :: [(Strict.ByteString, Strict.ByteString)] -> Headers -> Headers
+mkHeaders []              m = m
+mkHeaders ((key, val):xs) m = mkHeaders xs $
+                              case M.lookup (toNCBS key) m of
+                                Nothing  -> M.insert (toNCBS key) val m
+                                Just old -> M.insert (toNCBS key) (merge old val) m
+    where
+      merge :: Strict.ByteString -> Strict.ByteString -> Strict.ByteString
+      -- カンマ區切りである事を假定する。RFC ではカンマ區切りに出來ない
+      -- ヘッダは複數個あってはならない事になってゐる。
+      merge a b
+          | C8.null a && C8.null b = C8.empty
+          | C8.null a              = b
+          |              C8.null b = a
+          | otherwise              = C8.concat [a, C8.pack ", ", b]
 
 
-fromHeaders :: Headers -> [(ByteString, ByteString)]
+fromHeaders :: Headers -> [(Strict.ByteString, Strict.ByteString)]
 fromHeaders hs = [(fromNCBS a, b) | (a, b) <- M.toList hs]
 
 
@@ -150,9 +175,9 @@ fromHeaders hs = [(fromNCBS a, b) | (a, b) <- M.toList hs]
 headersP :: Parser Headers
 headersP = do xs <- many header
               crlf
-              return (M.fromList xs)
+              return $! toHeaders xs
     where
-      header :: Parser (NCBS, ByteString)
+      header :: Parser (Strict.ByteString, Strict.ByteString)
       header = do name <- token
                   char ':'
                   -- FIXME: これは多少インチキだが、RFC 2616 のこの部分
@@ -165,12 +190,12 @@ headersP = do xs <- many header
                   crlf
                   let value = foldr (++) "" contents
                       norm  = normalize value
-                  return (toNCBS $ C8.pack name, C8.pack norm)
+                  return (C8.pack name, C8.pack norm)
 
       normalize :: String -> String
       normalize = trimBody . trim isWhiteSpace
 
-      trimBody = foldr (++) []
+      trimBody = concat
                  . map (\ s -> if head s == ' ' then
                                    " "
                                else
@@ -181,15 +206,15 @@ headersP = do xs <- many header
                                else c)
 
 
-hPutHeaders :: Handle -> Headers -> IO ()
+hPutHeaders :: HandleLike h => h -> Headers -> IO ()
 hPutHeaders h hds
     = h `seq` hds `seq`
-      mapM_ putH (M.toList hds) >> hPutStr h "\r\n"
+      mapM_ putH (M.toList hds) >> hPutBS h (C8.pack "\r\n")
     where
-      putH :: (NCBS, ByteString) -> IO ()
+      putH :: (NCBS, Strict.ByteString) -> IO ()
       putH (name, value)
           = name `seq` value `seq`
-            do C8.hPutStr h (fromNCBS name)
-               C8.hPutStr h (C8.pack ": ")
-               C8.hPutStr h value
-               C8.hPutStr h (C8.pack "\r\n")
+            do hPutBS h (fromNCBS name)
+               hPutBS h (C8.pack ": ")
+               hPutBS h value
+               hPutBS h (C8.pack "\r\n")