Skip to content

Revert "Downgrade to our fork of http2 (#3141)" #3170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akshaymankar merged 1 commit into from
Mar 29, 2023
Merged

Revert "Downgrade to our fork of http2 (#3141)" #3170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion changelog.d/5-internal/downgrade-http2
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions libs/wai-utilities/src/Network/Wai/Utilities/MockServer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ module Network.Wai.Utilities.MockServer where

import qualified Control.Concurrent.Async as Async
import Control.Exception (throw)
import qualified Control.Exception as E
import Control.Monad.Catch
import Control.Monad.Codensity
import Data.Streaming.Network (bindRandomPortTCP)
import Imports
import qualified Network.HTTP2.Client as HTTP2
import qualified Network.Wai as Wai
import qualified Network.Wai.Handler.Warp as Warp
import qualified Network.Wai.Handler.WarpTLS as Warp
Expand All @@ -44,10 +46,10 @@ withMockServer app = Codensity $ \k ->
(liftIO . fst)
(k . fromIntegral . snd)

-- FUTUREWORK: Ignore HTTP2.ConnectionIsClosed after upgrading to more recent
-- http2 library.
ignoreHTTP2NonError :: Maybe Wai.Request -> SomeException -> IO ()
ignoreHTTP2NonError = Warp.defaultOnException
ignoreHTTP2NonError mr e
| Just HTTP2.ConnectionIsClosed <- E.fromException e = pure ()
| otherwise = Warp.defaultOnException mr e

-- | Start a mock warp server on a random port, serving the given Wai application.
--
Expand Down
2 changes: 1 addition & 1 deletion libs/wire-api-federation/src/Wire/API/Federation/Error.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ import qualified Data.Text.Lazy as LT
import Imports
import Network.HTTP.Types.Status
import qualified Network.HTTP.Types.Status as HTTP
import qualified Network.HTTP2.Frame as HTTP2
import qualified Network.HTTP2.Client as HTTP2
import qualified Network.Wai.Utilities.Error as Wai
import OpenSSL.Session (SomeSSLException)
import Servant.Client
Expand Down
11 changes: 4 additions & 7 deletions nix/haskell-pins.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ let
http-conduit = "http-conduit";
};
};
http2 = {
src = fetchgit {
url = "https://github.com/wireapp/http2";
rev = "aa3501ad58e1abbd196781fac25a84f41ec2a787";
sha256 = "09h86fkk8p7szq08x0iszaq16mhbylxivfc0apvj58d98wl8l6lq";
};
};
hspec-wai = {
src = fetchgit {
url = "https://github.com/wireapp/hspec-wai";
Expand Down Expand Up @@ -227,6 +220,10 @@ let
version = "0.11.7.5";
sha256 = "sha256-CfH1YJSGuF4O1aUfdJwUZKRrVzv5nSPhwoI7mf9ewEg=";
};
http2 = {
version = "4.0.0";
sha256 = "sha256-9rBhklwuuKZXWH4yV4tb7Sp5chR9AmBAMRBztDjx0uI=";
};
};
# Name -> Source -> Maybe Subpath -> Drv
mkGitDrv = name: src: subpath:
Expand Down