diff --git a/OpenId2/Discovery.hs b/OpenId2/Discovery.hs index 6381441e..a9ed6e88 100644 --- a/OpenId2/Discovery.hs +++ b/OpenId2/Discovery.hs @@ -32,6 +32,7 @@ import Control.Arrow (first, (***)) import Control.Monad.IO.Class (MonadIO) import Control.Failure (Failure (failure)) import Control.Monad (mplus, liftM) +import Network.Wai (ciOriginal) data Discovery = Discovery1 String (Maybe String) | Discovery2 Provider Identifier @@ -72,7 +73,7 @@ discoverYADIS ident mb_loc redirects = do res <- httpLbs req let mloc = fmap S8.unpack $ lookup "x-xrds-location" - $ map (first $ map toLower . S8.unpack) + $ map (first $ map toLower . S8.unpack . ciOriginal) $ responseHeaders res let mloc' = if mloc == mb_loc then Nothing else mloc case statusCode res of diff --git a/authenticate.cabal b/authenticate.cabal index 6e1f398f..66a09147 100644 --- a/authenticate.cabal +++ b/authenticate.cabal @@ -1,5 +1,5 @@ name: authenticate -version: 0.7.3 +version: 0.8.0 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -17,14 +17,15 @@ library build-depends: base >= 4 && < 5, data-object >= 0.3.1 && < 0.4, data-object-json >= 0.3.1 && < 0.4, - http-enumerator >= 0.2.0 && < 0.3, + http-enumerator >= 0.3.0 && < 0.4, tagsoup >= 0.6 && < 0.13, failure >= 0.0.0 && < 0.2, transformers >= 0.1 && < 0.3, bytestring >= 0.9 && < 0.10, utf8-string >= 0.3 && < 0.4, network >= 2.2.1 && < 2.4, - xml >= 1.3.7 && < 1.4 + xml >= 1.3.7 && < 1.4, + wai >= 0.3 && < 0.4 exposed-modules: Web.Authenticate.Rpxnow, Web.Authenticate.OpenId, Web.Authenticate.OpenId.Providers,