diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-06 22:38:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-06 22:38:01 -0400 |
| commit | 9aa9aa82b4ec92d5443624f99ab43c805bcc6aa0 (patch) | |
| tree | 9eedc72f42022b28c104240e656ac67c1a6df215 | |
| parent | 8cc000db77bf45541208786f830e77aab36b7962 (diff) | |
fix
| -rw-r--r-- | Utility/WebApp.hs | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index ce23da4bc..5ee53253f 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -76,8 +76,7 @@ runWebApp h app observer = withSocketsDo $ do #ifndef mingw32_HOST_OS sock <- getSocket h #else - let set = defaultSettings - sock <- bindPort (settingsPort set) (settingsHost set) + sock <- bindPort (settingsPort webAppSettings) (settingsHost webAppSettings) #endif void $ forkIO $ runSettingsSocket webAppSettings sock app sockaddr <- fixSockAddr <$> getSocketName sock diff --git a/git-annex.cabal b/git-annex.cabal index cee5b40d3..b4b3d209d 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -168,7 +168,7 @@ Executable git-annex yesod, yesod-default, yesod-static, yesod-form, yesod-core, case-insensitive, http-types, transformers, wai, wai-logger, warp, blaze-builder, crypto-api, hamlet, clientsession, - template-haskell, data-default, aeson + template-haskell, data-default, aeson, network-conduit CPP-Options: -DWITH_WEBAPP if flag(Pairing) |