Small fix

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

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index 2b81de1f88be64d5c12cc51f22be5b867347dbe5..9632b298193e30a24b4711519896be32b3fa72dd 100644 (file)
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,6 +1,7 @@
--- | The entry point of Lucu httpd.
+-- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
-    ( runHttpd
+    ( FallbackHandler
+    , runHttpd
     )
     where
 
@@ -15,14 +16,15 @@ import           Network.HTTP.Lucu.ResponseWriter
 import           System.IO
 import           System.Posix.Signals
 
--- | This is the entry point of Lucu httpd. It listens to a socket and
+-- |This is the entry point of Lucu httpd. It listens to a socket and
 -- waits for clients. Computation of 'runHttpd' never stops by itself
 -- so the only way to stop it is to raise an exception in the thread
 -- computing it.
 --
 -- Note that 'runHttpd' automatically makes SIGPIPE be ignored by
--- computing @installHandler sigPIPE Ignore Nothing@. This can hardly
--- cause a problem but it may do.
+-- computing @'System.Posix.Signals.installHandler'
+-- 'System.Posix.Signals.sigPIPE' 'System.Posix.Signals.Ignore'
+-- 'Prelude.Nothing'@. This can hardly cause a problem but it may do.
 --
 -- Example:
 --
@@ -33,24 +35,23 @@ import           System.Posix.Signals
 -- > main = let config    = defaultConfig
 -- >            resources = mkResTree [ ([], helloWorld) ]
 -- >        in
--- >          runHttpd config resourcees
+-- >          runHttpd config resourcees []
 -- >
 -- > helloWorld :: ResourceDef
 -- > helloWorld = ResourceDef {
 -- >                resUsesNativeThread = False
 -- >              , resIsGreedy         = False
 -- >              , resGet
--- >                  = Just $ do setContentType $ "text" </> "plain"
+-- >                  = Just $ do setContentType $ read "text/plain"
 -- >                              output "Hello, world!"
 -- >              , resHead   = Nothing
 -- >              , resPost   = Nothing
 -- >              , resPut    = Nothing
 -- >              , resDelete = Nothing
 -- >              }
-runHttpd :: Config -> ResTree -> IO ()
-runHttpd cnf tree
-    = cnf `seq` tree `seq`
-      withSocketsDo $
+runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
+runHttpd cnf tree fbs
+    = withSocketsDo $
       do installHandler sigPIPE Ignore Nothing
          so <- listenOn (cnfServerPort cnf)
          loop so
@@ -59,16 +60,14 @@ runHttpd cnf tree
       loop so
           -- 本當は Network.accept を使ひたいが、このアクションは勝手に
           -- リモートのIPを逆引きするので、使へない。
-          = so `seq`
-            do (h, addr) <- accept' so
+          = do (h, addr) <- accept' so
                tQueue    <- newInteractionQueue
-               readerTID <- forkIO $ requestReader cnf tree h addr tQueue
+               readerTID <- forkIO $ requestReader cnf tree fbs h addr tQueue
                writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
                loop so
 
       accept' :: Socket -> IO (Handle, So.SockAddr)
       accept' soSelf
-          = soSelf `seq`
-            do (soPeer, addr) <- So.accept soSelf
+          = do (soPeer, addr) <- So.accept soSelf
                hPeer          <- So.socketToHandle soPeer ReadWriteMode
                return (hPeer, addr)