summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2020-02-14 13:29:11 -0400
committerJoey Hess <joeyh@joeyh.name>2020-02-14 13:29:11 -0400
commitc04d1b3c85ed9ef2d91caa94b6e61be4bc04af9a (patch)
treeaba01a7ca3beda1c5a23b16825350b8b402e2fa6
parentecc210c3d045f66ecee0fb19482df06babf7aea8 (diff)
downloadkeysafe-c04d1b3c85ed9ef2d91caa94b6e61be4bc04af9a.tar.gz
support slightly older version of deps
Needed for slightly old lts, needed by debian since their stack is well out of date.
-rw-r--r--HTTP/Client.hs6
-rw-r--r--Storage.hs1
2 files changed, 2 insertions, 5 deletions
diff --git a/HTTP/Client.hs b/HTTP/Client.hs
index 61c862c..2edcadb 100644
--- a/HTTP/Client.hs
+++ b/HTTP/Client.hs
@@ -18,7 +18,6 @@ import Network.HTTP.Client hiding (port, host, Proxy)
import Network.HTTP.Client.Internal (Connection)
import Control.Exception
import Network.Socks5
-import Network.Socket (SockAddr(..), tupleToHostAddress)
import qualified Data.ByteString.UTF8 as BU8
import Data.List
import Data.Char
@@ -75,7 +74,7 @@ serverRequest' srv a = go Nothing (serverUrls srv)
maybe "no known address" (\err -> "server failure: " ++ show err) lasterr
go _ (url:urls) = do
mymanager <- torableManager
- res <- runClientM a (ClientEnv mymanager url Nothing defaultMakeClientRequest)
+ res <- runClientM a (ClientEnv mymanager url Nothing)
case res of
Left err -> go (Just err) urls
Right r -> return (Right r)
@@ -98,8 +97,7 @@ torConnection onionaddress p = do
socketConnection socket 8192
where
torsocksport = 9050
- torsockconf = defaultSocksConf $
- SockAddrInet torsocksport (tupleToHostAddress (127,0,0,1))
+ torsockconf = defaultSocksConf "127.0.0.1" torsocksport
socksdomain = SocksAddrDomainName (BU8.fromString onionaddress)
socksaddr = SocksAddress socksdomain (fromIntegral p)
diff --git a/Storage.hs b/Storage.hs
index 88e6ae5..c693376 100644
--- a/Storage.hs
+++ b/Storage.hs
@@ -19,7 +19,6 @@ import Tunables
import ByteStrings
import Data.Maybe
import Data.List
-import Data.Monoid
import Control.Monad
import Control.Concurrent.Thread.Delay
import Control.Concurrent.Async