Merge pull request #64 from well-typed/edsko/http2-5.1

Use latest http2
well-typed · Jan 24, 2024 · 7645559 · 7645559
2 parents 7db027b + 9fbacae
commit 7645559
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -28,9 +28,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.3
+          - compiler: ghc-9.6.4
             compilerKind: ghc
-            compilerVersion: 9.6.3
+            compilerVersion: 9.6.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
@@ -160,11 +160,6 @@ jobs:
           echo "package grapesy" >> cabal.project
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
-          source-repository-package
-            type:     git
-            location: http://github.com/edsko/http2
-            tag:      8bd2ac2df4d57697d4dc4a7535ee02784e842425
-
           package grapesy
             tests:       True
             flags:       +build-demo +build-stress-test

diff --git a/cabal.project b/cabal.project
@@ -3,8 +3,3 @@ packages: .
 package grapesy
   tests: True
   flags: +build-demo +build-stress-test
-
-source-repository-package
-  type: git
-  location: http://github.com/edsko/http2
-  tag: 8bd2ac2df4d57697d4dc4a7535ee02784e842425
diff --git a/cabal.project.ci b/cabal.project.ci
@@ -4,8 +4,3 @@ package grapesy
   tests: True
   flags: +build-demo +build-stress-test
   ghc-options: -Werror
-
-source-repository-package
-  type: git
-  location: http://github.com/edsko/http2
-  tag: 8bd2ac2df4d57697d4dc4a7535ee02784e842425
diff --git a/grapesy.cabal b/grapesy.cabal
@@ -15,7 +15,7 @@ data-files:         route_guide_db.json
 tested-with:        GHC==8.10.7
                   , GHC==9.2.8
                   , GHC==9.4.8
-                  , GHC==9.6.3
+                  , GHC==9.6.4
 
 common lang
   ghc-options:
@@ -153,8 +153,8 @@ library
     , generics-sop         >= 0.5   && < 0.6
     , hashable             >= 1.3   && < 1.5
     , http-types           >= 0.12  && < 0.13
-    , http2                >= 5.0   && < 5.1
-    , http2-tls            >= 0.2.1 && < 0.3
+    , http2                >= 5.1   && < 5.2
+    , http2-tls            >= 0.2.2 && < 0.3
     , mtl                  >= 2.2   && < 2.4
     , network              >= 3.1   && < 3.2
     , network-byte-order   >= 0.1   && < 0.2

diff --git a/src/Network/GRPC/Client/Connection.hs b/src/Network/GRPC/Client/Connection.hs
@@ -25,7 +25,6 @@ import Control.Monad
 import Control.Monad.Catch
 import Control.Tracer
 import Data.ByteString qualified as Strict (ByteString)
-import Data.ByteString.Char8 qualified as BS.Strict.Char8
 import Data.Default
 import Data.Foldable (asum)
 import Data.Maybe (fromMaybe)
@@ -508,13 +507,8 @@ stayConnected connParams server connStateVar connOutOfScope =
     clientConfig :: Address -> Scheme -> HTTP2.Client.ClientConfig
     clientConfig addr = \case
         Http ->
-          -- The spec mandates the use of UTF8
-          -- <https://www.rfc-editor.org/rfc/rfc3986#section-3.2.2>
-          -- but this is currently not what http2-tls does
-          -- <https://github.com/kazu-yamamoto/http2-tls/issues/7>
-          -- For consistency, we do the same as http2-tls here.
           HTTP2.Client.defaultClientConfig {
-              HTTP2.Client.authority = BS.Strict.Char8.pack authority
+              HTTP2.Client.authority = authority
             }
         Https ->
           HTTP2.TLS.Client.defaultClientConfig