From ee4f89f053edc954b6e28e54f6e5f762393f6f72 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 15 Aug 2012 17:48:40 +0300 Subject: [PATCH] http-conduit 1.6 (snoyberg/http-conduit#44) --- authenticate/OpenId2/Discovery.hs | 6 +++++- authenticate/authenticate.cabal | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/authenticate/OpenId2/Discovery.hs b/authenticate/OpenId2/Discovery.hs index 861ecdcf..9e183dbc 100644 --- a/authenticate/OpenId2/Discovery.hs +++ b/authenticate/OpenId2/Discovery.hs @@ -1,5 +1,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP #-} -------------------------------------------------------------------------------- -- | @@ -69,7 +70,10 @@ discoverYADIS :: (MonadResource m, MonadBaseControl IO m) -> Int -- ^ remaining redirects -> Manager -> m (Maybe (Provider, Identifier, IdentType)) -discoverYADIS _ _ 0 _ = liftIO $ throwIO TooManyRedirects +discoverYADIS _ _ 0 _ = liftIO $ throwIO $ TooManyRedirects +#if MIN_VERSION_http_conduit(1,6,0) + [] +#endif discoverYADIS ident mb_loc redirects manager = do let uri = fromMaybe (unpack $ identifier ident) mb_loc req <- liftIO $ parseUrl uri diff --git a/authenticate/authenticate.cabal b/authenticate/authenticate.cabal index cb75b554..88557478 100644 --- a/authenticate/authenticate.cabal +++ b/authenticate/authenticate.cabal @@ -1,5 +1,5 @@ name: authenticate -version: 1.3.0.1 +version: 1.3.1 license: BSD3 license-file: LICENSE author: Michael Snoyman, Hiromi Ishii, Arash Rouhani @@ -18,7 +18,7 @@ homepage: http://github.com/yesodweb/authenticate library build-depends: base >= 4 && < 5 , aeson >= 0.5 - , http-conduit >= 1.5 && < 1.6 + , http-conduit >= 1.5 && < 1.7 , tagsoup >= 0.12 && < 0.13 , transformers >= 0.1 && < 0.4 , bytestring >= 0.9