X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FConfig.hs;h=80845bd21edfdf1f618b9b5f2749dc64c9405a5d;hb=b22e702f8161447a460847c6e6c97104c150534f;hp=68bc365ade7c2d950d2949b70c3a13d0b74ca144;hpb=9668dc27a02b59d7bfb1e9e40af3d2619700ad69;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Config.hs b/Network/HTTP/Lucu/Config.hs
index 68bc365..80845bd 100644
--- a/Network/HTTP/Lucu/Config.hs
+++ b/Network/HTTP/Lucu/Config.hs
@@ -1,22 +1,30 @@
 {-# LANGUAGE
-    OverloadedStrings
+    CPP
+  , OverloadedStrings
   , UnicodeSyntax
   #-}
 -- |Configurations for the Lucu httpd.
 module Network.HTTP.Lucu.Config
     ( Config(..)
+#if defined(HAVE_SSL)
     , SSLConfig(..)
+#endif
     , defaultConfig
     )
     where
 import Data.Ascii (Ascii)
+import Data.CaseInsensitive (CI)
+import qualified Data.CaseInsensitive as CI
 import Data.Text (Text)
 import qualified Data.Text as T
 import Network
 import Network.BSD
 import Network.HTTP.Lucu.MIMEType.Guess
 import Network.HTTP.Lucu.MIMEType.DefaultExtensionMap
+#if defined(HAVE_SSL)
 import OpenSSL.Session
+#endif
+import Prelude.Unicode
 import System.IO.Unsafe
 
 -- |Configuration record for to run the httpd.
@@ -28,7 +36,7 @@ data Config = Config {
 
     -- |The host name of the server. This value will be used in
     -- built-in pages like \"404 Not Found\".
-    , cnfServerHost ∷ !Text
+    , cnfServerHost ∷ !(CI Text)
 
     -- |A port number (or a service name) to listen to HTTP clients.
     , cnfServerPort ∷ !ServiceName
@@ -46,9 +54,11 @@ data Config = Config {
     -- problem.)
     , cnfServerV6Addr ∷ !(Maybe HostName)
 
+#if defined(HAVE_SSL)
     -- |Configuration for HTTPS connections. Set this 'Nothing' to
     -- disable HTTPS.
     , cnfSSLConfig ∷ !(Maybe SSLConfig)
+#endif
 
     -- |The maximum number of requests to simultaneously accept in one
     -- connection. If a client exceeds this limitation, its last
@@ -59,9 +69,8 @@ data Config = Config {
     -- |The maximum length of request entity to accept in octets. Note
     -- that this is nothing but a default value used by
     -- 'Network.HTTP.Lucu.Resource.getForm' and such when they are
-    -- applied to 'Network.HTTP.Lucu.Resource.defaultLimit', so there
-    -- is no guarantee that this value always constrains all the
-    -- requests.
+    -- applied to 'Nothing', so there is no guarantee that this value
+    -- always constrains all the requests.
     , cnfMaxEntityLength ∷ !Int
 
     -- |Whether to dump too late abortions to the stderr or not. See
@@ -78,6 +87,7 @@ data Config = Config {
     , cnfExtToMIMEType ∷ !ExtMap
     }
 
+#if defined(HAVE_SSL)
 -- |Configuration record for HTTPS connections.
 data SSLConfig
     = SSLConfig {
@@ -90,6 +100,7 @@ data SSLConfig
         -- up yourself with at least a server certification.
       , sslContext ∷ !SSLContext
       }
+#endif
 
 -- |The default configuration. Generally you can use this value as-is,
 -- or possibly you just want to replace the 'cnfServerSoftware' and
@@ -97,11 +108,13 @@ data SSLConfig
 defaultConfig ∷ Config
 defaultConfig = Config {
                   cnfServerSoftware              = "Lucu/1.0"
-                , cnfServerHost                  = T.pack (unsafePerformIO getHostName)
+                , cnfServerHost                  = CI.mk ∘ T.pack $ unsafePerformIO getHostName
                 , cnfServerPort                  = "http"
                 , cnfServerV4Addr                = Just "0.0.0.0"
                 , cnfServerV6Addr                = Just "::"
+#if defined(HAVE_SSL)
                 , cnfSSLConfig                   = Nothing
+#endif
                 , cnfMaxPipelineDepth            = 100
                 , cnfMaxEntityLength             = 16 * 1024 * 1024 -- 16 MiB
                 , cnfDumpTooLateAbortionToStderr = True