23 lines
676 B
Diff
23 lines
676 B
Diff
--- Val.hs 2020-03-31 11:00:33.329814064 +0200
|
|
+++ Val.hs 2020-03-31 11:00:24.602711845 +0200
|
|
@@ -42,7 +42,7 @@
|
|
b64 :: B.ByteString -> T.Text
|
|
b64 = T.decodeUtf8 . B64.encode
|
|
|
|
-unb64 :: Monad m => T.Text -> m B.ByteString
|
|
+unb64 :: MonadFail m => T.Text -> m B.ByteString
|
|
unb64 t = either
|
|
(\_ -> fail "bad base64 data")
|
|
return
|
|
--- Server.hs 2020-03-31 12:53:45.860509650 +0200
|
|
+++ Server.hs 2020-03-31 12:52:34.873835069 +0200
|
|
@@ -105,7 +105,7 @@
|
|
-- (Workaround for
|
|
-- https://github.com/jaspervdj/websockets/issues/140)
|
|
setHost "*6" $
|
|
- setPort (serverPort o) $
|
|
+ setPort (CmdLine.serverPort o) $
|
|
defaultSettings
|
|
|
|
checkEnv :: ServerOpts -> IO ServerOpts
|