diff --git a/mighttpd2.cabal b/mighttpd2.cabal --- a/mighttpd2.cabal +++ b/mighttpd2.cabal @@ -1,5 +1,5 @@ Name: mighttpd2 -Version: 3.2.4 +Version: 3.2.5 Author: Kazu Yamamoto Maintainer: Kazu Yamamoto License: BSD3 @@ -66,7 +66,7 @@ Main-Is: Mighty.hs GHC-Options: -Wall -threaded -rtsopts if flag(tls) - Cpp-Options: -DTLS + Cpp-Options: -DHTTP_OVER_TLS Build-Depends: async Build-Depends: base >= 4.0 && < 5 , bytestring diff --git a/src/Mighty.hs b/src/Mighty.hs --- a/src/Mighty.hs +++ b/src/Mighty.hs @@ -2,7 +2,7 @@ module Main where -#ifndef TLS +#ifndef HTTP_OVER_TLS import Control.Monad (when) #endif import Data.Version (showVersion) @@ -72,7 +72,7 @@ hPutStrLn stderr $ reportFile ++ " is not writable" hPrint stderr e exitFailure -#ifdef TLS +#ifdef HTTP_OVER_TLS checkTLS _ = return () #else checkTLS opt = when (opt_service opt > 1) $ do diff --git a/src/Server.hs b/src/Server.hs --- a/src/Server.hs +++ b/src/Server.hs @@ -21,10 +21,10 @@ import Program.Mighty import WaiApp -#ifdef TLS +#ifdef HTTP_OVER_TLS import Control.Concurrent.Async (concurrently) -import Network.Wai.Handler.WarpTLS import Control.Monad (void) +import Network.Wai.Handler.WarpTLS #else data TLSSettings = TLSSettings #endif @@ -58,7 +58,7 @@ svc <- openService opt unless debug writePidFile rdr <- newRouteDBRef route -#ifdef TLS +#ifdef HTTP_OVER_TLS cert <- BS.readFile $ opt_tls_cert_file opt key <- BS.readFile $ opt_tls_key_file opt let tlsSetting = tlsSettingsMemory cert key @@ -142,7 +142,7 @@ mighty opt rpt svc lgr getInfo mgr rdr _tlsSetting = reportDo rpt $ case svc of HttpOnly s -> runSettingsSocket setting s app -#ifdef TLS +#ifdef HTTP_OVER_TLS HttpsOnly s -> runTLSSocket _tlsSetting setting s app HttpAndHttps s1 s2 -> void $ concurrently (runSettingsSocket setting s1 app) diff --git a/utils/mkindex.hs b/utils/mkindex.hs --- a/utils/mkindex.hs +++ b/utils/mkindex.hs @@ -1,15 +1,21 @@ -{- - mkindex :: Making index.html for the current directory. --} +{-# LANGUAGE CPP #-} + +-- mkindex :: Making index.html for the current directory. + import Control.Applicative import Data.Bits -import Data.Time +import Data.Time (formatTime) import Data.Time.Clock.POSIX import System.Directory -import System.Locale import System.Posix.Files import Text.Printf +#if MIN_VERSION_time(1,5,0) +import Data.Time (defaultTimeLocale) +#else +import System.Locale (defaultTimeLocale) +#endif + indexFile :: String indexFile = "index.html" @@ -67,29 +73,29 @@ header :: String header = "\ -\\n\ -\\n\ -\\n\ -\\n\ -\Directory contents\n\ -\\n\ -\

Directory contents

\n\ -\
\n\ -\
\n"
+\n\
+\n\
+\n\
+\n\
+Directory contents\n\
+\n\
+
Directory contents
\n\
+
\n\
+
\n"
 
 content :: Int -> (String,String,String,Int) -> String
 content lim (f,m,s,len) = "" ++ f ++ "  " ++ replicate (lim - len) ' ' ++ m ++ "  " ++ s ++ "\n"
 
 tailer :: String
 tailer = "\
-\
\n\
-\
\n\
-\\n\
-\\n"
+
\n\ +
\n\ +\n\ +\n"