X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=1d0f2b8a5c626d3aa8175c7d07927b88fdeff1cc;hb=f504167b85561373b4c444e2d37a513e0ab504a9;hp=2b81de1f88be64d5c12cc51f22be5b867347dbe5;hpb=858129cb755aa09da2b7bd758efb8519f2c89103;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index 2b81de1..1d0f2b8 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,28 +1,29 @@
--- | The entry point of Lucu httpd.
+-- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
-    ( runHttpd
+    ( FallbackHandler
+    , runHttpd
     )
     where
 
 import           Control.Concurrent
-import           Network
-import qualified Network.Socket as So
+import           Network hiding (accept)
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.RequestReader
 import           Network.HTTP.Lucu.Resource.Tree
 import           Network.HTTP.Lucu.ResponseWriter
-import           System.IO
+import           Network.HTTP.Lucu.SocketLike
 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,42 +34,39 @@ 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 $
-      do installHandler sigPIPE Ignore Nothing
-         so <- listenOn (cnfServerPort cnf)
-         loop so
-    where
-      loop :: Socket -> IO ()
-      loop so
-          -- 本當は Network.accept を使ひたいが、このアクションは勝手に
-          -- リモートのIPを逆引きするので、使へない。
-          = so `seq`
-            do (h, addr) <- accept' so
-               tQueue    <- newInteractionQueue
-               readerTID <- forkIO $ requestReader cnf tree h addr tQueue
-               writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
-               loop so
+runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
+runHttpd cnf tree fbs
+    = withSocketsDo $
+      do _ <- installHandler sigPIPE Ignore Nothing
 
-      accept' :: Socket -> IO (Handle, So.SockAddr)
-      accept' soSelf
-          = soSelf `seq`
-            do (soPeer, addr) <- So.accept soSelf
-               hPeer          <- So.socketToHandle soPeer ReadWriteMode
-               return (hPeer, addr)
+         case cnfSSLConfig cnf of
+           Nothing
+               -> return ()
+           Just scnf
+               -> do so       <- listenOn (sslServerPort scnf)
+                     _loopTID <- forkIO $ httpLoop (sslContext scnf, so)
+                     return ()
+         
+         httpLoop =<< listenOn (cnfServerPort cnf)
+    where
+      httpLoop :: SocketLike s => s -> IO ()
+      httpLoop so
+          = do (h, addr)  <- accept so
+               tQueue     <- newInteractionQueue
+               readerTID  <- forkIO $ requestReader cnf tree fbs h addr tQueue
+               _writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
+               httpLoop so