on master help sign in
finish mega installer
commit4d917bcef9d7ef8c48e252711ba2eea1f0951008 authorGreg Weber <greg@gregweber.info> dateFri 25 Nov 2011, 11:01 (15 years ago) parent2476229
2 files changed+27−3
wai-mega.cabal+17 warp/Network/Wai/Handler/Warp.hs+10−3
wai-mega.cabal+17
@@ -17,10 +17,27 @@ Source-repository head
1717 location: git://github.com/yesodweb/wai.git
1818
1919Library
20+ cpp-options: -DMEGA
21+ hs-source-dirs:
22+ wai
23+ wai-app-static
24+ wai-eventsource
25+ wai-extra
26+ wai-handler-devel
27+ wai-handler-fastcgi
28+ wai-handler-launch
29+ wai-handler-scgi
30+ wai-handler-webkit
31+ wai-test
32+ wai-websockets
33+ warp
34+ warp-static
35+
2036 Build-Depends: base >= 4 && < 5
2137
2238 -- wai-handler-scgi
2339 -- wai-handler-launch
40+ , process >= 1.0 && < 1.2
2441 -- warp-static
2542
2643 -- warp
warp/Network/Wai/Handler/Warp.hs+10−3
@@ -110,8 +110,6 @@ import Control.Monad (forever)
110110import qualified Network.HTTP.Types as H
111111import qualified Data.CaseInsensitive as CI
112112import System.IO (hPutStrLn, stderr)
113−import qualified Paths_warp
114−import Data.Version (showVersion)
115113
116114import Data.List (delete)
117115
@@ -121,6 +119,15 @@ import qualified Control.Concurrent.MVar as MV
121119import Network.Socket (withSocketsDo)
122120#endif
123121
122+#ifndef MEGA
123+import Data.Version (showVersion)
124+import qualified Paths_warp
125+warpVersion = showVersion Paths_warp.version
126+#else
127+warpVersion = "0.4.6"
128+#endif
129+warpVersion :: String
130+
124131bindPort :: Int -> String -> IO Socket
125132bindPort p s = do
126133 let hints = defaultHints { addrFlags = [AI_PASSIVE
@@ -612,6 +619,6 @@ serverHeader hdrs = case lookup key hdrs of
612619 Just svr -> servers svr : delete (key,svr) hdrs
613620 where
614621 key = "Server"
615− ver = B.pack $ "Warp/" ++ showVersion Paths_warp.version
622+ ver = B.pack $ "Warp/" ++ warpVersion
616623 server = (key, ver)
617624 servers svr = (key, S.concat [svr, " ", ver])