on master help sign in
.github/workflows/ci.yaml+8−10
since splitsnapshots
unifiedsplit
@@ -12,16 +12,14 @@ jobs:
12 runs-on: ubuntu-latest
12 runs-on: ubuntu-latest
13 steps:
13 steps:
14 - uses: actions/checkout@v4
14 - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v15
15+ - uses: haskell-actions/run-ormolu@v17
16 build:
16 build:
17 runs-on: ubuntu-latest
17 runs-on: ubuntu-latest
18 needs: ormolu
18 needs: ormolu
19 strategy:
19 strategy:
20 matrix:
20 matrix:
21− cabal: ["3.10"]
21+ cabal: ["3.12"]
22− ghc: ["9.4.7", "9.6.3", "9.8.1"]
22+ ghc: ["9.6.3", "9.8.2", "9.10.1"]
23− env:
24− CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
25 steps:
23 steps:
26 - uses: actions/checkout@v4
24 - uses: actions/checkout@v4
27 - uses: haskell-actions/setup@v2
25 - uses: haskell-actions/setup@v2
@@ -30,8 +28,8 @@ jobs:
30 ghc-version: ${{ matrix.ghc }}
28 ghc-version: ${{ matrix.ghc }}
31 cabal-version: ${{ matrix.cabal }}
29 cabal-version: ${{ matrix.cabal }}
32 - run: cabal update
30 - run: cabal update
33− - run: cabal freeze $CONFIG
31+ - run: cabal freeze
34− - uses: actions/cache@v4.0.0
32+ - uses: actions/cache@v4.2.3
35 with:
33 with:
36 path: |
34 path: |
37 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
35 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -40,10 +38,10 @@ jobs:
40 restore-keys: |
38 restore-keys: |
41 ${{ runner.os }}-${{ matrix.ghc }}-
39 ${{ runner.os }}-${{ matrix.ghc }}-
42 - run: cabal format && git diff --exit-code --color=always
40 - run: cabal format && git diff --exit-code --color=always
43− - run: cabal build $CONFIG
41+ - run: cabal build
44 - run: |
42 - run: |
45 docker pull kennethreitz/httpbin
43 docker pull kennethreitz/httpbin
46 docker run -p 1234:80 kennethreitz/httpbin &
44 docker run -p 1234:80 kennethreitz/httpbin &
47− cabal test $CONFIG
45+ cabal test
48− - run: cabal haddock $CONFIG
46+ - run: cabal haddock
49 - run: cabal sdist
47 - run: cabal sdist
CHANGELOG.md+10
@@ -1,3 +1,13 @@
1+## Req 3.13.4
2+
3+* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`
4+ (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now
5+ compatible with older versions of `crypton-connection` (>= 0.3).
6+
7+## Req 3.13.3
8+
9+* Works with `crypton-connection-0.4` and newer.
10+
1## Req 3.13.2
11## Req 3.13.2
2
12
3* Disable the problematic `httpbin-tests` test suite by default. Only enable
13* Disable the problematic `httpbin-tests` test suite by default. Only enable
Network/HTTP/Req.hs+8−9
@@ -585,10 +585,10 @@ req' method url body options m = do
585 withReqManager (m request)
585 withReqManager (m request)
586
586
587-- | Perform an action using the global implicit 'L.Manager' that the rest
587-- | Perform an action using the global implicit 'L.Manager' that the rest
588−-- of the library uses. This allows to reuse connections that the
588+-- of the library uses. This allows us to reuse connections that the
589-- 'L.Manager' controls.
589-- 'L.Manager' controls.
590withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
590withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591−withReqManager m = liftIO (readIORef globalManager) >>= m
591+withReqManager m = m globalManager
592
592
593-- | The global 'L.Manager' that 'req' uses. Here we just go with the
593-- | The global 'L.Manager' that 'req' uses. Here we just go with the
594-- default settings, so users don't need to deal with this manager stuff at
594-- default settings, so users don't need to deal with this manager stuff at
@@ -601,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m
601-- manager. From that moment on the 'IORef' will be just reused—exactly the
601-- manager. From that moment on the 'IORef' will be just reused—exactly the
602-- behavior we want here in order to maximize connection sharing. GHC could
602-- behavior we want here in order to maximize connection sharing. GHC could
603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
604−globalManager :: IORef L.Manager
604+globalManager :: L.Manager
605globalManager = unsafePerformIO $ do
605globalManager = unsafePerformIO $ do
606 context <- NC.initConnectionContext
606 context <- NC.initConnectionContext
607 let settings =
607 let settings =
608 L.mkManagerSettingsContext
608 L.mkManagerSettingsContext
609 (Just context)
609 (Just context)
610− (NC.TLSSettingsSimple False False False def)
610+ def
611 Nothing
611 Nothing
612 manager <- L.newManager settings
612 manager <- L.newManager settings
613− newIORef manager
613+ return manager
614{-# NOINLINE globalManager #-}
614{-# NOINLINE globalManager #-}
615
615
616----------------------------------------------------------------------------
616----------------------------------------------------------------------------
@@ -716,7 +716,6 @@ data HttpConfig = HttpConfig
716 -- @since 3.6.0
716 -- @since 3.6.0
717 httpConfigBodyPreviewLength :: forall a. (Num a) => a
717 httpConfigBodyPreviewLength :: forall a. (Num a) => a
718 }
718 }
719− deriving (Typeable)
720
719
721-- | The default value of 'HttpConfig'.
720-- | The default value of 'HttpConfig'.
722--
721--
@@ -1025,7 +1024,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
1025-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1026data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1027 -- NOTE The second value is the path segments in reversed order.
1026 -- NOTE The second value is the path segments in reversed order.
1028− deriving (Eq, Ord, Show, Data, Typeable, Generic)
1027+ deriving (Eq, Ord, Show, Data, Generic)
1029
1028
1030type role Url nominal
1029type role Url nominal
1031
1030
@@ -2012,7 +2011,7 @@ data HttpException
2012 | -- | A wrapper with Aeson-produced 'String' describing why decoding
2011 | -- | A wrapper with Aeson-produced 'String' describing why decoding
2013 -- failed
2012 -- failed
2014 JsonHttpException String
2013 JsonHttpException String
2015− deriving (Show, Typeable, Generic)
2014+ deriving (Show, Generic)
2016
2015
2017instance Exception HttpException
2016instance Exception HttpException
2018
2017
@@ -2049,4 +2048,4 @@ data Scheme
2049 Http
2048 Http
2050 | -- | HTTPS
2049 | -- | HTTPS
2051 Https
2050 Https
2052− deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)
2051+ deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
README.md+1−1
@@ -4,7 +4,7 @@
4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
7−![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)
7+[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)
8
8
9* [Related packages](#related-packages)
9* [Related packages](#related-packages)
10* [Blog posts](#blog-posts)
10* [Blog posts](#blog-posts)
cabal.projectnew file+4
@@ -0,0 +1,4 @@
1+packages: .
2+tests: True
3+benchmarks: True
4+constraints: req +dev
req.cabal+11−9
@@ -1,11 +1,11 @@
1cabal-version: 2.4
1cabal-version: 2.4
2name: req
2name: req
3−version: 3.13.2
3+version: 3.13.4
4license: BSD-3-Clause
4license: BSD-3-Clause
5license-file: LICENSE.md
5license-file: LICENSE.md
6maintainer: Mark Karpov <markkarpov92@gmail.com>
6maintainer: Mark Karpov <markkarpov92@gmail.com>
7author: Mark Karpov <markkarpov92@gmail.com>
7author: Mark Karpov <markkarpov92@gmail.com>
8−tested-with: ghc ==9.4.7 ghc ==9.6.3 ghc ==9.8.1
8+tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1
9homepage: https://github.com/mrkkrp/req
9homepage: https://github.com/mrkkrp/req
10bug-reports: https://github.com/mrkkrp/req/issues
10bug-reports: https://github.com/mrkkrp/req/issues
11synopsis: HTTP client library
11synopsis: HTTP client library
@@ -39,9 +39,9 @@ library
39 blaze-builder >=0.3 && <0.5,
39 blaze-builder >=0.3 && <0.5,
40 bytestring >=0.10.8 && <0.13,
40 bytestring >=0.10.8 && <0.13,
41 case-insensitive >=0.2 && <1.3,
41 case-insensitive >=0.2 && <1.3,
42− containers >=0.5 && <0.7,
42+ containers >=0.5 && <0.8,
43− crypton-connection >=0.4 && <0.5,
43+ crypton-connection >=0.4.2 && <0.5,
44− data-default-class,
44+ data-default-class >=0.2.0.0,
45 exceptions >=0.6 && <0.11,
45 exceptions >=0.6 && <0.11,
46 http-api-data >=0.2 && <0.7,
46 http-api-data >=0.2 && <0.7,
47 http-client >=0.7.13.1 && <0.8,
47 http-client >=0.7.13.1 && <0.8,
@@ -51,14 +51,16 @@ library
51 monad-control >=1.0 && <1.1,
51 monad-control >=1.0 && <1.1,
52 mtl >=2.0 && <3.0,
52 mtl >=2.0 && <3.0,
53 retry >=0.8 && <0.10,
53 retry >=0.8 && <0.10,
54− template-haskell >=2.19 && <2.22,
54+ template-haskell >=2.19 && <2.23,
55 text >=0.2 && <2.2,
55 text >=0.2 && <2.2,
56 transformers >=0.5.3.0 && <0.7,
56 transformers >=0.5.3.0 && <0.7,
57 transformers-base,
57 transformers-base,
58 unliftio-core >=0.1.1 && <0.3
58 unliftio-core >=0.1.1 && <0.3
59
59
60 if flag(dev)
60 if flag(dev)
61+ ghc-options:
61− ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages
62+ -Wall -Werror -Wpartial-fields -Wunused-packages
63+ -Wno-unused-imports
62
64
63 else
65 else
64 ghc-options: -O2 -Wall
66 ghc-options: -O2 -Wall
@@ -85,9 +87,9 @@ test-suite pure-tests
85 modern-uri >=0.3 && <0.4,
87 modern-uri >=0.3 && <0.4,
86 req,
88 req,
87 retry >=0.8 && <0.10,
89 retry >=0.8 && <0.10,
88− template-haskell >=2.19 && <2.22,
90+ template-haskell >=2.19 && <2.23,
89 text >=0.2 && <2.2,
91 text >=0.2 && <2.2,
90− time >=1.2 && <1.13
92+ time >=1.2 && <1.15
91
93
92 if flag(dev)
94 if flag(dev)
93 ghc-options:
95 ghc-options: