on master help sign in
6 files changed+43−28
since splitsnapshots
unifiedsplit
.github/workflows/ci.yaml+8−10 CHANGELOG.md+10 Network/HTTP/Req.hs+9−9 README.md+1−1 cabal.project+4 req.cabal+11−8
.github/workflows/ci.yaml+8−10
@@ -12,16 +12,14 @@ jobs:
1212 runs-on: ubuntu-latest
1313 steps:
1414 - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v14
15+ - uses: haskell-actions/run-ormolu@v17
1616 build:
1717 runs-on: ubuntu-latest
1818 needs: ormolu
1919 strategy:
2020 matrix:
21− cabal: ["3.10"]
22− ghc: ["9.4.7", "9.6.3", "9.8.1"]
23− env:
24− CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
21+ cabal: ["3.12"]
22+ ghc: ["9.6.3", "9.8.2", "9.10.1"]
2523 steps:
2624 - uses: actions/checkout@v4
2725 - uses: haskell-actions/setup@v2
@@ -30,8 +28,8 @@ jobs:
3028 ghc-version: ${{ matrix.ghc }}
3129 cabal-version: ${{ matrix.cabal }}
3230 - run: cabal update
33− - run: cabal freeze $CONFIG
34− - uses: actions/cache@v4.0.0
31+ - run: cabal freeze
32+ - uses: actions/cache@v4.2.3
3533 with:
3634 path: |
3735 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -40,10 +38,10 @@ jobs:
4038 restore-keys: |
4139 ${{ runner.os }}-${{ matrix.ghc }}-
4240 - run: cabal format && git diff --exit-code --color=always
43− - run: cabal build $CONFIG
41+ - run: cabal build
4442 - run: |
4543 docker pull kennethreitz/httpbin
4644 docker run -p 1234:80 kennethreitz/httpbin &
47− cabal test $CONFIG
48− - run: cabal haddock $CONFIG
45+ cabal test
46+ - run: cabal haddock
4947 - 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+
111## Req 3.13.2
212
313* Disable the problematic `httpbin-tests` test suite by default. Only enable
Network/HTTP/Req.hs+9−9
@@ -236,6 +236,7 @@ import Data.ByteString qualified as B
236236import Data.ByteString.Lazy qualified as BL
237237import Data.CaseInsensitive qualified as CI
238238import Data.Data (Data)
239+import Data.Default.Class (def)
239240import Data.Function (on)
240241import Data.IORef
241242import Data.Kind (Constraint, Type)
@@ -584,10 +585,10 @@ req' method url body options m = do
584585 withReqManager (m request)
585586
586587-- | Perform an action using the global implicit 'L.Manager' that the rest
587−-- of the library uses. This allows to reuse connections that the
588+-- of the library uses. This allows us to reuse connections that the
588589-- 'L.Manager' controls.
589590withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
590−withReqManager m = liftIO (readIORef globalManager) >>= m
591+withReqManager m = m globalManager
591592
592593-- | The global 'L.Manager' that 'req' uses. Here we just go with the
593594-- default settings, so users don't need to deal with this manager stuff at
@@ -600,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m
600601-- manager. From that moment on the 'IORef' will be just reused—exactly the
601602-- behavior we want here in order to maximize connection sharing. GHC could
602603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
603−globalManager :: IORef L.Manager
604+globalManager :: L.Manager
604605globalManager = unsafePerformIO $ do
605606 context <- NC.initConnectionContext
606607 let settings =
607608 L.mkManagerSettingsContext
608609 (Just context)
609− (NC.TLSSettingsSimple False False False)
610+ def
610611 Nothing
611612 manager <- L.newManager settings
612− newIORef manager
613+ return manager
613614{-# NOINLINE globalManager #-}
614615
615616----------------------------------------------------------------------------
@@ -715,7 +716,6 @@ data HttpConfig = HttpConfig
715716 -- @since 3.6.0
716717 httpConfigBodyPreviewLength :: forall a. (Num a) => a
717718 }
718− deriving (Typeable)
719719
720720-- | The default value of 'HttpConfig'.
721721--
@@ -1024,7 +1024,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
10241024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
10251025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
10261026 -- NOTE The second value is the path segments in reversed order.
1027− deriving (Eq, Ord, Show, Data, Typeable, Generic)
1027+ deriving (Eq, Ord, Show, Data, Generic)
10281028
10291029type role Url nominal
10301030
@@ -2011,7 +2011,7 @@ data HttpException
20112011 | -- | A wrapper with Aeson-produced 'String' describing why decoding
20122012 -- failed
20132013 JsonHttpException String
2014− deriving (Show, Typeable, Generic)
2014+ deriving (Show, Generic)
20152015
20162016instance Exception HttpException
20172017
@@ -2048,4 +2048,4 @@ data Scheme
20482048 Http
20492049 | -- | HTTPS
20502050 Https
2051− 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 @@
44[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
55[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
66[![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)
88
99* [Related packages](#related-packages)
1010* [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−8
@@ -1,11 +1,11 @@
11cabal-version: 2.4
22name: req
3−version: 3.13.1
3+version: 3.13.4
44license: BSD-3-Clause
55license-file: LICENSE.md
66maintainer: Mark Karpov <markkarpov92@gmail.com>
77author: 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
99homepage: https://github.com/mrkkrp/req
1010bug-reports: https://github.com/mrkkrp/req/issues
1111synopsis: HTTP client library
@@ -39,8 +39,9 @@ library
3939 blaze-builder >=0.3 && <0.5,
4040 bytestring >=0.10.8 && <0.13,
4141 case-insensitive >=0.2 && <1.3,
42− containers >=0.5 && <0.7,
43− crypton-connection >=0.2.2 && <0.4,
42+ containers >=0.5 && <0.8,
43+ crypton-connection >=0.4.2 && <0.5,
44+ data-default-class >=0.2.0.0,
4445 exceptions >=0.6 && <0.11,
4546 http-api-data >=0.2 && <0.7,
4647 http-client >=0.7.13.1 && <0.8,
@@ -50,14 +51,16 @@ library
5051 monad-control >=1.0 && <1.1,
5152 mtl >=2.0 && <3.0,
5253 retry >=0.8 && <0.10,
53− template-haskell >=2.19 && <2.22,
54+ template-haskell >=2.19 && <2.23,
5455 text >=0.2 && <2.2,
5556 transformers >=0.5.3.0 && <0.7,
5657 transformers-base,
5758 unliftio-core >=0.1.1 && <0.3
5859
5960 if flag(dev)
60− ghc-options: -Wall -Werror -Wpartial-fields -Wunused-packages
61+ ghc-options:
62+ -Wall -Werror -Wpartial-fields -Wunused-packages
63+ -Wno-unused-imports
6164
6265 else
6366 ghc-options: -O2 -Wall
@@ -84,9 +87,9 @@ test-suite pure-tests
8487 modern-uri >=0.3 && <0.4,
8588 req,
8689 retry >=0.8 && <0.10,
87− template-haskell >=2.19 && <2.22,
90+ template-haskell >=2.19 && <2.23,
8891 text >=0.2 && <2.2,
89− time >=1.2 && <1.13
92+ time >=1.2 && <1.15
9093
9194 if flag(dev)
9295 ghc-options: