Skip to content

Use Cabal PackageInfo_warp instead of Paths_warp #1042

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

Closed
lrworth wants to merge 2 commits into from
+19 −22
Closed

Use Cabal PackageInfo_warp instead of Paths_warp #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35065d3
Replace Paths_warp with PackageInfo_warp
lrworth Aug 27, 2025
c7a0b8b
Fix deprecations
lrworth Aug 27, 2025
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
2 changes: 1 addition & 1 deletion warp/Network/Wai/Handler/Warp/HTTP2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ wrappedRecvN th slowlorisSize readN bufsize = do
handler = throughAsync (return "")

-- connClose must not be called here since Run:fork calls it
goaway :: Connection -> H2.ErrorCodeId -> ByteString -> IO ()
goaway :: Connection -> H2.ErrorCode -> ByteString -> IO ()
goaway Connection{..} etype debugmsg = connSendAll bytestream
where
einfo = H2.encodeInfo id 0
Expand Down
14 changes: 7 additions & 7 deletions warp/Network/Wai/Handler/Warp/HTTP2/Request.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ toRequest' ii settings addr ref (reqths, reqvt) bodylen body th transport =
Nothing -> case mAuth of
Just auth -> (tokenHost, auth) : reqths
_ -> reqths
!mPath = getHeaderValue tokenPath reqvt -- SHOULD
!colonMethod = fromJust $ getHeaderValue tokenMethod reqvt -- MUST
!mAuth = getHeaderValue tokenAuthority reqvt -- SHOULD
!mHost = getHeaderValue tokenHost reqvt
!mRange = getHeaderValue tokenRange reqvt
!mReferer = getHeaderValue tokenReferer reqvt
!mUserAgent = getHeaderValue tokenUserAgent reqvt
!mPath = getFieldValue tokenPath reqvt -- SHOULD
Copy link
Contributor

@Vlix Vlix Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requires an increase to the lower version bound of http2 (>= 5.2)

!colonMethod = fromJust $ getFieldValue tokenMethod reqvt -- MUST
!mAuth = getFieldValue tokenAuthority reqvt -- SHOULD
!mHost = getFieldValue tokenHost reqvt
!mRange = getFieldValue tokenRange reqvt
!mReferer = getFieldValue tokenReferer reqvt
!mUserAgent = getFieldValue tokenUserAgent reqvt
-- CONNECT request will have ":path" omitted, use ":authority" as unparsed
-- path instead so that it will have consistent behavior compare to HTTP 1.0
(unparsedPath, query) = C8.break (== '?') $ fromJust (mPath <|> mAuth)
Expand Down
3 changes: 1 addition & 2 deletions warp/Network/Wai/Handler/Warp/Request.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import qualified Data.ByteString as S
import qualified Data.ByteString.Unsafe as SU
import qualified Data.CaseInsensitive as CI
import qualified Data.IORef as I
import Data.Typeable (Typeable)
import qualified Data.Vault.Lazy as Vault
import Data.Word8 (_cr, _lf)
#ifdef MIN_VERSION_crypton_x509
Expand Down Expand Up @@ -136,7 +135,7 @@ headerLines maxTotalHeaderLength firstRequest src = do
else push maxTotalHeaderLength src (THStatus 0 0 id id) bs

data NoKeepAliveRequest = NoKeepAliveRequest
deriving (Show, Typeable)
deriving (Show)
instance Exception NoKeepAliveRequest

----------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions warp/Network/Wai/Handler/Warp/Response.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import qualified Network.HTTP.Types as H
import qualified Network.HTTP.Types.Header as H
import Network.Wai
import Network.Wai.Internal
import qualified Paths_warp
import qualified PackageInfo_warp
import qualified System.TimeManager as T

import Network.Wai.Handler.Warp.Buffer (toBuilderBuffer)
Expand Down Expand Up @@ -481,7 +481,7 @@ addDate getdate rspidxhdr hdrs = case rspidxhdr ! fromEnum ResDate of

-- | The version of Warp.
warpVersion :: String
warpVersion = showVersion Paths_warp.version
warpVersion = showVersion PackageInfo_warp.version
Copy link
Contributor

@Vlix Vlix Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did this end up in this module?

Can you move this to Network.Wai.Handler.Warp.Internal and re-export from here with a comment that it's for backwards compatibility?


{-# INLINE addServer #-}
addServer
Expand Down
1 change: 0 additions & 1 deletion warp/Network/Wai/Handler/Warp/ResponseHeader.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module Network.Wai.Handler.Warp.ResponseHeader (composeHeader) where
import qualified Data.ByteString as S
import Data.ByteString.Internal (create)
import qualified Data.CaseInsensitive as CI
import Data.List (foldl')
Copy link
Contributor

@Vlix Vlix Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I expect this to fail on any GHC < 9.10, so this might need CPP around it.

import Data.Word8
import Foreign.Ptr
import GHC.Storable
Expand Down
4 changes: 2 additions & 2 deletions warp/Network/Wai/Handler/Warp/Settings.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import GHC.Prim (fork#)
import qualified Network.HTTP.Types as H
import Network.Socket (SockAddr, Socket, accept)
import Network.Wai
import qualified Paths_warp
import qualified PackageInfo_warp
import System.IO (stderr)
import System.IO.Error (ioeGetErrorType)
import System.TimeManager
Expand Down Expand Up @@ -206,7 +206,7 @@ defaultSettings =
, settingsAccept = defaultAccept
, settingsNoParsePath = False
, settingsInstallShutdownHandler = const $ return ()
, settingsServerName = C8.pack $ "Warp/" ++ showVersion Paths_warp.version
, settingsServerName = C8.pack $ "Warp/" ++ showVersion PackageInfo_warp.version
Copy link
Contributor

@Vlix Vlix Aug 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After moving warpVersion to Network.Wai.Handler.Warp.Internal, please import from there and use here.

, settingsMaximumBodyFlush = Just 8192
, settingsProxyProtocol = ProxyProtocolNone
, settingsSlowlorisSize = 2048
Expand Down
5 changes: 2 additions & 3 deletions warp/Network/Wai/Handler/Warp/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ module Network.Wai.Handler.Warp.Types where

import qualified Data.ByteString as S
import Data.IORef (IORef, newIORef, readIORef, writeIORef)
import Data.Typeable (Typeable)
import qualified Control.Exception as E
#ifdef MIN_VERSION_crypton_x509
import Data.X509
Expand Down Expand Up @@ -46,7 +45,7 @@ data InvalidRequest
PayloadTooLarge
| -- | Since 3.3.22
RequestHeaderFieldsTooLarge
deriving (Eq, Typeable)
deriving (Eq)

instance Show InvalidRequest where
show (NotEnoughLines xs) = "Warp: Incomplete request headers, received: " ++ show xs
Expand All @@ -71,7 +70,7 @@ instance E.Exception InvalidRequest
-- Used to determine whether keeping the HTTP1.1 connection / HTTP2 stream alive is safe
-- or irrecoverable.
newtype ExceptionInsideResponseBody = ExceptionInsideResponseBody E.SomeException
deriving (Show, Typeable)
deriving (Show)

instance E.Exception ExceptionInsideResponseBody

Expand Down
8 changes: 4 additions & 4 deletions warp/warp.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: >=1.10
cabal-version: 3.12
name: warp
version: 3.4.8
license: MIT
Expand Down Expand Up @@ -78,7 +78,7 @@ library
Network.Wai.Handler.Warp.Types
Network.Wai.Handler.Warp.Windows
Network.Wai.Handler.Warp.WithApplication
Paths_warp
PackageInfo_warp

default-language: Haskell2010
ghc-options: -Wall
Expand Down Expand Up @@ -208,7 +208,7 @@ test-suite spec
Network.Wai.Handler.Warp.Types
Network.Wai.Handler.Warp.Windows
Network.Wai.Handler.Warp.WithApplication
Paths_warp
PackageInfo_warp

default-language: Haskell2010
ghc-options: -Wall -threaded
Expand Down Expand Up @@ -285,7 +285,7 @@ benchmark parser
Network.Wai.Handler.Warp.RequestHeader
Network.Wai.Handler.Warp.Settings
Network.Wai.Handler.Warp.Types
Paths_warp
PackageInfo_warp

default-language: Haskell2010
build-depends:
Expand Down
Loading